From 5ba4756a52e8f1280d4dbcff62dec4a4aeb47d1c Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Wed, 12 Jun 2013 19:32:48 -0600
Subject: Don't make assumptions about the host architecture.

---
 test/lib/common.inc | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

(limited to 'test/lib/common.inc')

diff --git a/test/lib/common.inc b/test/lib/common.inc
index be039fa..2d6140f 100644
--- a/test/lib/common.inc
+++ b/test/lib/common.inc
@@ -5,6 +5,12 @@ set -E
 TMPDIR="$(mktemp -d /tmp/${0##*/}.XXXXXXXXXX)"
 . "$(dirname ${BASH_SOURCE[0]})/../../db-functions"
 
+arches() (
+	. $(librelib conf.sh)
+	load_files libretools
+	printf '%s\n' "${ARCHES[*]}"
+)
+
 signpkg() {
 	if [[ -r '/etc/makepkg.conf' ]]; then
 		source '/etc/makepkg.conf'
@@ -24,6 +30,7 @@ oneTimeSetUp() {
 	local p
 	local d
 	local a
+	local arches=($(arches))
 	local pkgname
 	local pkgarch
 	local pkgversion
@@ -49,14 +56,16 @@ oneTimeSetUp() {
 				sudo libremakepkg || die 'libremakepkg failed'
 			else
 				for a in ${pkgarch[@]}; do
-					sudo setarch $a libremakepkg -n $a || die "setarch ${a} libremakepkg -n ${a} failed"
+					if in_array $a ${arches[@]}; then
+						sudo setarch $a libremakepkg -n $a || die "setarch ${a} libremakepkg -n ${a} failed"
+						for p in ${pkgname[@]}; do
+							cp ${p}-${pkgversion}-${a}${PKGEXT} $(dirname ${BASH_SOURCE[0]})/../packages/${d##*/}
+						done
+					else
+						warning "skipping arch %s" "$a"
+					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
-			done
 		fi
 		popd >/dev/null
 	done
@@ -161,7 +170,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 $(arches); 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}"
@@ -268,7 +277,7 @@ checkRemovedAnyPackageDB() {
 	local db
 
 	for db in ${DBEXT} ${FILESEXT}; do
-		for arch in i686 x86_64; do
+		for arch in $(arches); 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.*}"
-- 
cgit v1.2.3-2-g168b