summaryrefslogtreecommitdiff
path: root/test/lib
diff options
context:
space:
mode:
Diffstat (limited to 'test/lib')
-rw-r--r--test/lib/common.inc16
1 files changed, 10 insertions, 6 deletions
diff --git a/test/lib/common.inc b/test/lib/common.inc
index 9a7e4d9..5b06616 100644
--- a/test/lib/common.inc
+++ b/test/lib/common.inc
@@ -48,13 +48,17 @@ oneTimeSetUp() {
sudo extra-x86_64-build || die 'extra-x86_64-build failed'
else
for a in "${pkgarch[@]}"; do
- sudo "extra-${a}-build" || die "extra-${a}-build failed"
+ if in_array "$a" "${ARCH_BUILD[@]}"; then
+ sudo "extra-${a}-build" || die "extra-${a}-build failed"
+ fi
done
fi
for a in "${pkgarch[@]}"; do
- for p in "${pkgname[@]}"; do
- cp "${p}-${pkgversion}-${a}"${PKGEXT} "$(dirname "${BASH_SOURCE[0]}")/../packages/${d##*/}"
- done
+ if in_array "$a" "${ARCH_BUILD[@]}"; then
+ for p in "${pkgname[@]}"; do
+ cp "${p}-${pkgversion}-${a}"${PKGEXT} "$(dirname "${BASH_SOURCE[0]}")/../packages/${d##*/}"
+ done
+ fi
done
fi
popd >/dev/null
@@ -160,7 +164,7 @@ checkAnyPackageDB() {
[ -r "${FTP_BASE}/${PKGPOOL}/${pkg}.sig" ] || fail "${PKGPOOL}/${pkg}.sig not found"
fi
- for arch in i686 x86_64; do
+ for arch in "${ARCH_BUILD[@]}"; do
[ -L "${FTP_BASE}/${repo}/os/${arch}/${pkg}" ] || fail "${repo}/os/${arch}/${pkg} is not a symlink"
[ "$(readlink -e "${FTP_BASE}/${repo}/os/${arch}/${pkg}")" == "${FTP_BASE}/${PKGPOOL}/${pkg}" ] \
|| fail "${repo}/os/${arch}/${pkg} does not link to ${PKGPOOL}/${pkg}"
@@ -267,7 +271,7 @@ checkRemovedAnyPackageDB() {
local db
for db in "${DBEXT}" "${FILESEXT}"; do
- for arch in i686 x86_64; do
+ for arch in "${ARCH_BUILD[@]}"; do
( [ -r "${FTP_BASE}/${repo}/os/${arch}/${repo}${db%.tar.*}" ] \
&& bsdtar -xf "${FTP_BASE}/${repo}/os/${arch}/${repo}${db%.tar.*}" -O | grep -q "${pkgbase}") \
&& fail "${pkgbase} should not be in ${repo}/os/${arch}/${repo}${db%.tar.*}"