diff options
author | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-06-15 13:57:35 -0600 |
---|---|---|
committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-06-17 23:52:01 -0600 |
commit | d0e9909ce3419c36e134227318a29f2f1fd782a2 (patch) | |
tree | 7db6b87bb13b440e061a2fb528804a09cfe482eb /test/test.d/db-update.sh | |
parent | 5c72f37618b77e7c7ebcab2c998e7be468c34e02 (diff) |
fix tests
- properly set SRCPOOL
- have SVNREPO point to the checkout, not the server repo
- in case TMPDIR has a symlink in it, use `readlink -e` on both sides of
inspecting symlinks.
- use `grep {pattern} &>/dev/null` instead of `grep -q {pattern}`. Because
`grep -q` is able to bail early, a program being piped in to it may spit
out a message about a write error to stderr.
Diffstat (limited to 'test/test.d/db-update.sh')
-rwxr-xr-x | test/test.d/db-update.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/test.d/db-update.sh b/test/test.d/db-update.sh index 4e77140..7f1874b 100755 --- a/test/test.d/db-update.sh +++ b/test/test.d/db-update.sh @@ -134,7 +134,7 @@ testUpdateSameAnyPackageToDifferentRepositories() { local arch for arch in $(arches); do ( [ -r "${FTP_BASE}/testing/os/${arch}/testing${DBEXT%.tar.*}" ] \ - && bsdtar -xf "${FTP_BASE}/testing/os/${arch}/testing${DBEXT%.tar.*}" -O | grep -q ${pkgbase}) \ + && bsdtar -xf "${FTP_BASE}/testing/os/${arch}/testing${DBEXT%.tar.*}" -O | grep ${pkgbase} &>/dev/null) \ && fail "${pkgbase} should not be in testing/os/${arch}/testing${DBEXT%.tar.*}" done } @@ -157,7 +157,7 @@ testAddIncompleteSplitPackage() { for arch in ${arches[@]}; do ( [ -r "${FTP_BASE}/${repo}/os/${arch}/${repo}${DBEXT%.tar.*}" ] \ - && bsdtar -xf "${FTP_BASE}/${repo}/os/${arch}/${repo}${DBEXT%.tar.*}" -O | grep -q ${pkgbase}) \ + && bsdtar -xf "${FTP_BASE}/${repo}/os/${arch}/${repo}${DBEXT%.tar.*}" -O | grep ${pkgbase} &>/dev/null) \ && fail "${pkgbase} should not be in ${repo}/os/${arch}/${repo}${DBEXT%.tar.*}" done } |