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/test.d/create-filelists.sh | 8 ++++----
 test/test.d/db-move.sh          | 8 ++++----
 test/test.d/db-remove.sh        | 4 ++--
 test/test.d/db-repo-add.sh      | 4 ++--
 test/test.d/db-repo-remove.sh   | 4 ++--
 test/test.d/db-update.sh        | 8 ++++----
 test/test.d/ftpdir-cleanup.sh   | 6 +++---
 test/test.d/sourceballs.sh      | 6 +++---
 8 files changed, 24 insertions(+), 24 deletions(-)

(limited to 'test/test.d')

diff --git a/test/test.d/create-filelists.sh b/test/test.d/create-filelists.sh
index 49734c4..8df7030 100755
--- a/test/test.d/create-filelists.sh
+++ b/test/test.d/create-filelists.sh
@@ -4,7 +4,7 @@ curdir=$(readlink -e $(dirname $0))
 . "${curdir}/../lib/common.inc"
 
 testCreateSimpleFileLists() {
-	local arches=('i686' 'x86_64')
+	local arches=(`arches`)
 	local pkgs=('pkg-simple-a' 'pkg-simple-b' 'pkg-simple-epoch')
 	local pkgbase
 	local arch
@@ -26,7 +26,7 @@ testCreateSimpleFileLists() {
 }
 
 testCreateAnyFileLists() {
-	local arches=('i686' 'x86_64')
+	local arches=(`arches`)
 	local pkgs=('pkg-any-a' 'pkg-any-b')
 	local pkgbase
 	local arch
@@ -46,7 +46,7 @@ testCreateAnyFileLists() {
 }
 
 testCreateSplitFileLists() {
-	local arches=('i686' 'x86_64')
+	local arches=(`arches`)
 	local pkgs=('pkg-split-a' 'pkg-split-b')
 	local pkg
 	local pkgbase
@@ -75,7 +75,7 @@ testCreateSplitFileLists() {
 
 
 testCleanupFileLists() {
-	local arches=('i686' 'x86_64')
+	local arches=(`arches`)
 	local pkgs=('pkg-simple-a' 'pkg-simple-b')
 	local pkgbase
 	local arch
diff --git a/test/test.d/db-move.sh b/test/test.d/db-move.sh
index 890ffc4..3cf355b 100755
--- a/test/test.d/db-move.sh
+++ b/test/test.d/db-move.sh
@@ -4,7 +4,7 @@ curdir=$(readlink -e $(dirname $0))
 . "${curdir}/../lib/common.inc"
 
 testMoveSimplePackages() {
-	local arches=('i686' 'x86_64')
+	local arches=(`arches`)
 	local pkgs=('pkg-simple-a' 'pkg-simple-b')
 	local pkgbase
 	local arch
@@ -28,7 +28,7 @@ testMoveSimplePackages() {
 }
 
 testMoveMultiplePackages() {
-	local arches=('i686' 'x86_64')
+	local arches=(`arches`)
 	local pkgs=('pkg-simple-a' 'pkg-simple-b')
 	local pkgbase
 	local arch
@@ -52,7 +52,7 @@ testMoveMultiplePackages() {
 }
 
 testMoveEpochPackages() {
-	local arches=('i686' 'x86_64')
+	local arches=(`arches`)
 	local pkgs=('pkg-simple-epoch')
 	local pkgbase
 	local arch
@@ -90,7 +90,7 @@ testMoveAnyPackages() {
 }
 
 testMoveSplitPackages() {
-	local arches=('i686' 'x86_64')
+	local arches=(`arches`)
 	local pkgs=('pkg-split-a' 'pkg-split-b')
 	local pkg
 	local pkgbase
diff --git a/test/test.d/db-remove.sh b/test/test.d/db-remove.sh
index 416e693..d79605e 100755
--- a/test/test.d/db-remove.sh
+++ b/test/test.d/db-remove.sh
@@ -4,7 +4,7 @@ curdir=$(readlink -e $(dirname $0))
 . "${curdir}/../lib/common.inc"
 
 testRemovePackages() {
-	local arches=('i686' 'x86_64')
+	local arches=(`arches`)
 	local pkgs=('pkg-simple-a' 'pkg-simple-b' 'pkg-split-a' 'pkg-split-b' 'pkg-simple-epoch')
 	local pkgbase
 	local arch
@@ -31,7 +31,7 @@ testRemovePackages() {
 }
 
 testRemoveMultiplePackages() {
-	local arches=('i686' 'x86_64')
+	local arches=(`arches`)
 	local pkgs=('pkg-simple-a' 'pkg-simple-b' 'pkg-split-a' 'pkg-split-b' 'pkg-simple-epoch')
 	local pkgbase
 	local arch
diff --git a/test/test.d/db-repo-add.sh b/test/test.d/db-repo-add.sh
index 8603104..09fc52f 100755
--- a/test/test.d/db-repo-add.sh
+++ b/test/test.d/db-repo-add.sh
@@ -4,7 +4,7 @@ curdir=$(readlink -e $(dirname $0))
 . "${curdir}/../lib/common.inc"
 
 testAddSimplePackages() {
-	local arches=('i686' 'x86_64')
+	local arches=(`arches`)
 	local pkgs=('pkg-simple-a' 'pkg-simple-b')
 	local pkgbase
 	local arch
@@ -27,7 +27,7 @@ testAddSimplePackages() {
 }
 
 testAddMultiplePackages() {
-	local arches=('i686' 'x86_64')
+	local arches=(`arches`)
 	local pkgs=('pkg-simple-a' 'pkg-simple-b')
 	local pkgbase
 	local arch
diff --git a/test/test.d/db-repo-remove.sh b/test/test.d/db-repo-remove.sh
index 315d63d..eec0109 100755
--- a/test/test.d/db-repo-remove.sh
+++ b/test/test.d/db-repo-remove.sh
@@ -4,7 +4,7 @@ curdir=$(readlink -e $(dirname $0))
 . "${curdir}/../lib/common.inc"
 
 testRemovePackages() {
-	local arches=('i686' 'x86_64')
+	local arches=(`arches`)
 	local pkgs=('pkg-simple-a' 'pkg-simple-b' 'pkg-simple-epoch')
 	local pkgbase
 	local arch
@@ -31,7 +31,7 @@ testRemovePackages() {
 }
 
 testRemoveMultiplePackages() {
-	local arches=('i686' 'x86_64')
+	local arches=(`arches`)
 	local pkgs=('pkg-simple-a' 'pkg-simple-b' 'pkg-simple-epoch')
 	local pkgbase
 	local arch
diff --git a/test/test.d/db-update.sh b/test/test.d/db-update.sh
index 4b3008e..4e77140 100755
--- a/test/test.d/db-update.sh
+++ b/test/test.d/db-update.sh
@@ -4,7 +4,7 @@ curdir=$(readlink -e $(dirname $0))
 . "${curdir}/../lib/common.inc"
 
 testAddSimplePackages() {
-	local arches=('i686' 'x86_64')
+	local arches=(`arches`)
 	local pkgs=('pkg-simple-a' 'pkg-simple-b')
 	local pkgbase
 	local arch
@@ -52,7 +52,7 @@ testAddAnyPackages() {
 }
 
 testAddSplitPackages() {
-	local arches=('i686' 'x86_64')
+	local arches=(`arches`)
 	local pkgs=('pkg-split-a' 'pkg-split-b')
 	local pkg
 	local pkgbase
@@ -132,7 +132,7 @@ testUpdateSameAnyPackageToDifferentRepositories() {
 	../db-update >/dev/null 2>&1 && (fail 'Adding an existing package to another repository should fail'; return 1)
 
 	local arch
-	for arch in i686 x86_64; do
+	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}) \
 			&& fail "${pkgbase} should not be in testing/os/${arch}/testing${DBEXT%.tar.*}"
@@ -141,7 +141,7 @@ testUpdateSameAnyPackageToDifferentRepositories() {
 
 
 testAddIncompleteSplitPackage() {
-	local arches=('i686' 'x86_64')
+	local arches=(`arches`)
 	local repo='extra'
 	local pkgbase='pkg-split-a'
 	local arch
diff --git a/test/test.d/ftpdir-cleanup.sh b/test/test.d/ftpdir-cleanup.sh
index bfea7ea..630b88f 100755
--- a/test/test.d/ftpdir-cleanup.sh
+++ b/test/test.d/ftpdir-cleanup.sh
@@ -4,7 +4,7 @@ curdir=$(readlink -e $(dirname $0))
 . "${curdir}/../lib/common.inc"
 
 testCleanupSimplePackages() {
-	local arches=('i686' 'x86_64')
+	local arches=(`arches`)
 	local pkgs=('pkg-simple-a' 'pkg-simple-b')
 	local pkgbase
 	local arch
@@ -35,7 +35,7 @@ testCleanupSimplePackages() {
 }
 
 testCleanupEpochPackages() {
-	local arches=('i686' 'x86_64')
+	local arches=(`arches`)
 	local pkgs=('pkg-simple-epoch')
 	local pkgbase
 	local arch
@@ -85,7 +85,7 @@ testCleanupAnyPackages() {
 }
 
 testCleanupSplitPackages() {
-	local arches=('i686' 'x86_64')
+	local arches=(`arches`)
 	local pkgs=('pkg-split-a' 'pkg-split-b')
 	local pkg
 	local pkgbase
diff --git a/test/test.d/sourceballs.sh b/test/test.d/sourceballs.sh
index fdcf08c..472cb30 100755
--- a/test/test.d/sourceballs.sh
+++ b/test/test.d/sourceballs.sh
@@ -4,7 +4,7 @@ curdir=$(readlink -e $(dirname $0))
 . "${curdir}/../lib/common.inc"
 
 testSourceballs() {
-	local arches=('i686' 'x86_64')
+	local arches=(`arches`)
 	local pkgs=('pkg-simple-a' 'pkg-simple-b' 'pkg-simple-epoch')
 	local pkgbase
 	local arch
@@ -38,7 +38,7 @@ testAnySourceballs() {
 }
 
 testSplitSourceballs() {
-	local arches=('i686' 'x86_64')
+	local arches=(`arches`)
 	local pkgs=('pkg-split-a' 'pkg-split-b')
 	local pkg
 	local pkgbase
@@ -59,7 +59,7 @@ testSplitSourceballs() {
 }
 
 testSourceballsCleanup() {
-	local arches=('i686' 'x86_64')
+	local arches=(`arches`)
 	local pkgs=('pkg-simple-a' 'pkg-simple-b')
 	local pkgbase
 	local arch
-- 
cgit v1.2.3-1-g4caf