diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-04-17 15:41:37 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-04-17 15:41:37 -0400 |
| commit | da0737360ab185844e4461d7580cf81c639e9ded (patch) | |
| tree | afdc2387e43645a62410852d96fa0cf549363597 /test | |
| parent | 0b96686ab36ddc29e07281d52dd7790c5c5ca89d (diff) | |
| parent | 9705ba8a148d03dfd4c2184f3a1f13ee373eb826 (diff) | |
Merge branch 'lukeshu/archlinux+cleanup+librelib' into lukeshu/xbs
# Conflicts:
# config
# cron-jobs/makepkg.conf
# cron-jobs/update-web-db
# db-functions
# db-move
# db-remove
# db-update
# test/lib/common.inc
# test/test.d/create-filelists.sh
# test/test.d/db-update.sh
# testing2x
Diffstat (limited to 'test')
| -rw-r--r-- | test/lib/common.inc | 4 | ||||
| -rwxr-xr-x | test/test.d/db-update.sh | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/test/lib/common.inc b/test/lib/common.inc index eede414..1831602 100644 --- a/test/lib/common.inc +++ b/test/lib/common.inc @@ -5,10 +5,6 @@ set -E . "$(dirname "${BASH_SOURCE[0]}")/../../config.testing" . "$(dirname "${BASH_SOURCE[0]}")/../../db-functions" -arch_svn() { - /usr/bin/svn "$@" -} - signpkg() { if [[ -r '/etc/makepkg.conf' ]]; then source '/etc/makepkg.conf' diff --git a/test/test.d/db-update.sh b/test/test.d/db-update.sh index 1581bee..5d3c833 100755 --- a/test/test.d/db-update.sh +++ b/test/test.d/db-update.sh @@ -132,7 +132,7 @@ testUpdateSameAnyPackageToDifferentRepositories() { local arch for arch in "${ARCH_BUILD[@]}"; do ( [ -r "${FTP_BASE}/testing/os/${arch}/testing${DBEXT%.tar.*}" ] \ - && bsdtar -xf "${FTP_BASE}/testing/os/${arch}/testing${DBEXT%.tar.*}" -O | grep ${pkgbase} &>/dev/null) \ + && 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 } @@ -154,7 +154,7 @@ testAddIncompleteSplitPackage() { for arch in "${ARCH_BUILD[@]}"; do ( [ -r "${FTP_BASE}/${repo}/os/${arch}/${repo}${DBEXT%.tar.*}" ] \ - && bsdtar -xf "${FTP_BASE}/${repo}/os/${arch}/${repo}${DBEXT%.tar.*}" -O | grep ${pkgbase} &>/dev/null) \ + && 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 } |