test/: Make which architectures to build for configurable.

1 files changed, 9 insertions, 13 deletions

diff --git a/test/test.d/db-move.sh b/test/test.d/db-move.sh
index e3207b6..410e222 100755
--- a/test/test.d/db-move.sh
+++ b/test/test.d/db-move.sh
@@ -4,13 +4,12 @@ curdir=$(readlink -e "$(dirname "$0")")
 . "${curdir}/../lib/common.inc"
 
 testMoveSimplePackages() {
-	local arches=('i686' 'x86_64')
 	local pkgs=('pkg-simple-a' 'pkg-simple-b')
 	local pkgbase
 	local arch
 
 	for pkgbase in "${pkgs[@]}"; do
-		for arch in "${arches[@]}"; do
+		for arch in "${ARCH_BUILD[@]}"; do
 			releasePackage testing "${pkgbase}" "${arch}"
 		done
 	done
@@ -19,7 +18,7 @@ testMoveSimplePackages() {
 
 	../db-move testing extra pkg-simple-a
 
-	for arch in "${arches[@]}"; do
+	for arch in "${ARCH_BUILD[@]}"; do
 		checkPackage extra "pkg-simple-a-1-1-${arch}.pkg.tar.xz" "${arch}"
 		checkRemovedPackage testing "pkg-simple-a-1-1-${arch}.pkg.tar.xz" "${arch}"
 
@@ -28,13 +27,12 @@ testMoveSimplePackages() {
 }
 
 testMoveMultiplePackages() {
-	local arches=('i686' 'x86_64')
 	local pkgs=('pkg-simple-a' 'pkg-simple-b')
 	local pkgbase
 	local arch
 
 	for pkgbase in "${pkgs[@]}"; do
-		for arch in "${arches[@]}"; do
+		for arch in "${ARCH_BUILD[@]}"; do
 			releasePackage testing "${pkgbase}" "${arch}"
 		done
 	done
@@ -44,7 +42,7 @@ testMoveMultiplePackages() {
 	../db-move testing extra pkg-simple-a pkg-simple-b
 
 	for pkgbase in "${pkgs[@]}"; do
-		for arch in "${arches[@]}"; do
+		for arch in "${ARCH_BUILD[@]}"; do
 			checkPackage extra "${pkgbase}-1-1-${arch}.pkg.tar.xz" "${arch}"
 			checkRemovedPackage testing "${pkgbase}-1-1-${arch}.pkg.tar.xz" "${arch}"
 		done
@@ -52,13 +50,12 @@ testMoveMultiplePackages() {
 }
 
 testMoveEpochPackages() {
-	local arches=('i686' 'x86_64')
 	local pkgs=('pkg-simple-epoch')
 	local pkgbase
 	local arch
 
 	for pkgbase in "${pkgs[@]}"; do
-		for arch in "${arches[@]}"; do
+		for arch in "${ARCH_BUILD[@]}"; do
 			releasePackage testing "${pkgbase}" "${arch}"
 		done
 	done
@@ -67,7 +64,7 @@ testMoveEpochPackages() {
 
 	../db-move testing extra pkg-simple-epoch
 
-	for arch in "${arches[@]}"; do
+	for arch in "${ARCH_BUILD[@]}"; do
 		checkPackage extra "pkg-simple-epoch-1:1-1-${arch}.pkg.tar.xz" "${arch}"
 		checkRemovedPackage testing "pkg-simple-epoch-1:1-1-${arch}.pkg.tar.xz" "${arch}"
 	done
@@ -90,14 +87,13 @@ testMoveAnyPackages() {
 }
 
 testMoveSplitPackages() {
-	local arches=('i686' 'x86_64')
 	local pkgs=('pkg-split-a' 'pkg-split-b')
 	local pkg
 	local pkgbase
 	local arch
 
 	for pkgbase in "${pkgs[@]}"; do
-		for arch in "${arches[@]}"; do
+		for arch in "${ARCH_BUILD[@]}"; do
 			releasePackage testing "${pkgbase}" "${arch}"
 		done
 	done
@@ -105,12 +101,12 @@ testMoveSplitPackages() {
 	../db-update
 	../db-move testing extra pkg-split-a
 
-	for arch in "${arches[@]}"; do
+	for arch in "${ARCH_BUILD[@]}"; do
 		for pkg in "${pkgdir}/pkg-split-a"/*-"${arch}"${PKGEXT}; do
 			checkPackage extra "${pkg##*/}" "${arch}"
 		done
 	done
-	for arch in "${arches[@]}"; do
+	for arch in "${ARCH_BUILD[@]}"; do
 		for pkg in "${pkgdir}/pkg-split-b"/*-"${arch}"${PKGEXT}; do
 			checkPackage testing "${pkg##*/}" "${arch}"
 		done