From fdc37e5cf06d845a88971881a99de034a723c94a Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@sbcglobal.net>
Date: Sun, 17 Apr 2016 01:59:40 -0400
Subject: Grab an updated test/ directory from
 lukeshu/archlinux+cleanup+librelib

It's not like we were running the tests anyway, and this makes merging
easier.
---
 test/test.d/create-filelists.sh |  48 ++++++-------
 test/test.d/db-move.sh          |  68 +++++++++---------
 test/test.d/db-remove.sh        |  50 +++++++------
 test/test.d/db-repo-add.sh      |  30 ++++----
 test/test.d/db-repo-remove.sh   |  38 +++++-----
 test/test.d/db-update.sh        |  69 ++++++++++--------
 test/test.d/ftpdir-cleanup.sh   |  61 ++++++++--------
 test/test.d/packages.sh         |   2 +-
 test/test.d/pool-transition.sh  | 152 ----------------------------------------
 test/test.d/signed-packages.sh  |  27 ++++++-
 test/test.d/sourceballs.sh      |  47 ++++++-------
 test/test.d/testing2x.sh        |   6 +-
 12 files changed, 228 insertions(+), 370 deletions(-)
 delete mode 100755 test/test.d/pool-transition.sh

(limited to 'test/test.d')

diff --git a/test/test.d/create-filelists.sh b/test/test.d/create-filelists.sh
index 49734c4..21bf292 100755
--- a/test/test.d/create-filelists.sh
+++ b/test/test.d/create-filelists.sh
@@ -1,23 +1,22 @@
 #!/bin/bash
 
-curdir=$(readlink -e $(dirname $0))
+curdir="$(dirname "$(readlink -e "$0")")"
 . "${curdir}/../lib/common.inc"
 
 testCreateSimpleFileLists() {
-	local arches=('i686' 'x86_64')
 	local pkgs=('pkg-simple-a' 'pkg-simple-b' 'pkg-simple-epoch')
 	local pkgbase
 	local arch
 
-	for pkgbase in ${pkgs[@]}; do
-		for arch in ${arches[@]}; do
-			releasePackage extra ${pkgbase} ${arch}
+	for pkgbase in "${pkgs[@]}"; do
+		for arch in "${ARCH_BUILD[@]}"; do
+			releasePackage extra "${pkgbase}" "${arch}"
 		done
 	done
 	../db-update
 
-	for pkgbase in ${pkgs[@]}; do
-		for arch in ${arches[@]}; do
+	for pkgbase in "${pkgs[@]}"; do
+		for arch in "${ARCH_BUILD[@]}"; do
 			if ! bsdtar -xOf "${FTP_BASE}/extra/os/${arch}/extra${FILESEXT}" | grep -q "usr/bin/${pkgbase}"; then
 				fail "usr/bin/${pkgbase} not found in ${arch}/extra${FILESEXT}"
 			fi
@@ -26,18 +25,17 @@ testCreateSimpleFileLists() {
 }
 
 testCreateAnyFileLists() {
-	local arches=('i686' 'x86_64')
 	local pkgs=('pkg-any-a' 'pkg-any-b')
 	local pkgbase
 	local arch
 
-	for pkgbase in ${pkgs[@]}; do
-		releasePackage extra ${pkgbase} any
+	for pkgbase in "${pkgs[@]}"; do
+		releasePackage extra "${pkgbase}" any
 	done
 	../db-update
 
-	for pkgbase in ${pkgs[@]}; do
-		for arch in ${arches[@]}; do
+	for pkgbase in "${pkgs[@]}"; do
+		for arch in "${ARCH_BUILD[@]}"; do
 			if ! bsdtar -xOf "${FTP_BASE}/extra/os/${arch}/extra${FILESEXT}" | grep -q "usr/share/${pkgbase}/test"; then
 				fail "usr/share/${pkgbase}/test not found in ${arch}/extra${FILESEXT}"
 			fi
@@ -46,7 +44,6 @@ testCreateAnyFileLists() {
 }
 
 testCreateSplitFileLists() {
-	local arches=('i686' 'x86_64')
 	local pkgs=('pkg-split-a' 'pkg-split-b')
 	local pkg
 	local pkgbase
@@ -54,17 +51,17 @@ testCreateSplitFileLists() {
 	local pkgnames
 	local arch
 
-	for pkgbase in ${pkgs[@]}; do
-		for arch in ${arches[@]}; do
-			releasePackage extra ${pkgbase} ${arch}
+	for pkgbase in "${pkgs[@]}"; do
+		for arch in "${ARCH_BUILD[@]}"; do
+			releasePackage extra "${pkgbase}" "${arch}"
 		done
 	done
 	../db-update
 
-	for pkgbase in ${pkgs[@]}; do
+	for pkgbase in "${pkgs[@]}"; do
 		pkgnames=($(source "${TMP}/svn-packages-copy/${pkgbase}/trunk/PKGBUILD"; echo ${pkgname[@]}))
-		for pkgname in ${pkgnames[@]}; do
-			for arch in ${arches[@]}; do
+		for pkgname in "${pkgnames[@]}"; do
+			for arch in "${ARCH_BUILD[@]}"; do
 				if ! bsdtar -xOf "${FTP_BASE}/extra/os/${arch}/extra${FILESEXT}" | grep -q "usr/bin/${pkgname}"; then
 					fail "usr/bin/${pkgname} not found in ${arch}/extra${FILESEXT}"
 				fi
@@ -75,23 +72,22 @@ testCreateSplitFileLists() {
 
 
 testCleanupFileLists() {
-	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
-			releasePackage extra ${pkgbase} ${arch}
+	for pkgbase in "${pkgs[@]}"; do
+		for arch in "${ARCH_BUILD[@]}"; do
+			releasePackage extra "${pkgbase}" "${arch}"
 		done
 	done
 	../db-update
 
-	for arch in ${arches[@]}; do
-		../db-remove extra ${arch} pkg-simple-a
+	for arch in "${ARCH_BUILD[@]}"; do
+		../db-remove extra "${arch}" pkg-simple-a
 	done
 
-	for arch in ${arches[@]}; do
+	for arch in "${ARCH_BUILD[@]}"; do
 		if ! bsdtar -xOf "${FTP_BASE}/extra/os/${arch}/extra${FILESEXT}" | grep -q "usr/bin/pkg-simple-b"; then
 			fail "usr/bin/pkg-simple-b not found in ${arch}/extra${FILESEXT}"
 		fi
diff --git a/test/test.d/db-move.sh b/test/test.d/db-move.sh
index 9d7c1f6..4b4120e 100755
--- a/test/test.d/db-move.sh
+++ b/test/test.d/db-move.sh
@@ -1,17 +1,16 @@
 #!/bin/bash
 
-curdir=$(readlink -e $(dirname $0))
+curdir="$(dirname "$(readlink -e "$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
-			releasePackage testing ${pkgbase} ${arch}
+	for pkgbase in "${pkgs[@]}"; do
+		for arch in "${ARCH_BUILD[@]}"; do
+			releasePackage testing "${pkgbase}" "${arch}"
 		done
 	done
 
@@ -19,23 +18,22 @@ testMoveSimplePackages() {
 
 	../db-move testing extra pkg-simple-a
 
-	for arch in ${arches[@]}; 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}
+	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}"
 
-		checkPackage testing pkg-simple-b-1-1-${arch}.pkg.tar.xz ${arch}
+		checkPackage testing "pkg-simple-b-1-1-${arch}.pkg.tar.xz" "${arch}"
 	done
 }
 
 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
-			releasePackage testing ${pkgbase} ${arch}
+	for pkgbase in "${pkgs[@]}"; do
+		for arch in "${ARCH_BUILD[@]}"; do
+			releasePackage testing "${pkgbase}" "${arch}"
 		done
 	done
 
@@ -43,23 +41,22 @@ testMoveMultiplePackages() {
 
 	../db-move testing extra pkg-simple-a pkg-simple-b
 
-	for pkgbase in ${pkgs[@]}; do
-		for arch in ${arches[@]}; do
-			checkPackage extra ${pkgbase}-1-1-${arch}.pkg.tar.xz ${arch}
-			checkRemovedPackage testing ${pkgbase}-1-1-${arch}.pkg.tar.xz ${arch}
+	for pkgbase in "${pkgs[@]}"; 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
 	done
 }
 
 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
-			releasePackage testing ${pkgbase} ${arch}
+	for pkgbase in "${pkgs[@]}"; do
+		for arch in "${ARCH_BUILD[@]}"; do
+			releasePackage testing "${pkgbase}" "${arch}"
 		done
 	done
 
@@ -67,9 +64,9 @@ testMoveEpochPackages() {
 
 	../db-move testing extra pkg-simple-epoch
 
-	for arch in ${arches[@]}; 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}
+	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
 }
 
@@ -77,8 +74,8 @@ testMoveAnyPackages() {
 	local pkgs=('pkg-any-a' 'pkg-any-b')
 	local pkgbase
 
-	for pkgbase in ${pkgs[@]}; do
-		releasePackage testing ${pkgbase} any
+	for pkgbase in "${pkgs[@]}"; do
+		releasePackage testing "${pkgbase}" any
 	done
 
 	../db-update
@@ -90,29 +87,28 @@ 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
-			releasePackage testing ${pkgbase} ${arch}
+	for pkgbase in "${pkgs[@]}"; do
+		for arch in "${ARCH_BUILD[@]}"; do
+			releasePackage testing "${pkgbase}" "${arch}"
 		done
 	done
 
 	../db-update
 	../db-move testing extra pkg-split-a
 
-	for arch in ${arches[@]}; do
-		for pkg in "${pkgdir}/pkg-split-a"/*-${arch}${PKGEXT}; do
-			checkPackage extra $(basename ${pkg}) ${arch}
+	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 pkg in "${pkgdir}/pkg-split-b"/*-${arch}${PKGEXT}; do
-			checkPackage testing $(basename ${pkg}) ${arch}
+	for arch in "${ARCH_BUILD[@]}"; do
+		for pkg in "${pkgdir}/pkg-split-b"/*-"${arch}"${PKGEXT}; do
+			checkPackage testing "${pkg##*/}" "${arch}"
 		done
 	done
 
diff --git a/test/test.d/db-remove.sh b/test/test.d/db-remove.sh
index 416e693..a391197 100755
--- a/test/test.d/db-remove.sh
+++ b/test/test.d/db-remove.sh
@@ -1,56 +1,54 @@
 #!/bin/bash
 
-curdir=$(readlink -e $(dirname $0))
+curdir="$(dirname "$(readlink -e "$0")")"
 . "${curdir}/../lib/common.inc"
 
 testRemovePackages() {
-	local arches=('i686' 'x86_64')
 	local pkgs=('pkg-simple-a' 'pkg-simple-b' 'pkg-split-a' 'pkg-split-b' 'pkg-simple-epoch')
 	local pkgbase
 	local arch
 
-	for pkgbase in ${pkgs[@]}; do
-		for arch in ${arches[@]}; do
-			releasePackage extra ${pkgbase} ${arch}
+	for pkgbase in "${pkgs[@]}"; do
+		for arch in "${ARCH_BUILD[@]}"; do
+			releasePackage extra "${pkgbase}" "${arch}"
 		done
 	done
 
 	../db-update
 
-	for pkgbase in ${pkgs[@]}; do
-		for arch in ${arches[@]}; do
-			../db-remove extra ${arch} ${pkgbase}
+	for pkgbase in "${pkgs[@]}"; do
+		for arch in "${ARCH_BUILD[@]}"; do
+			../db-remove extra "${arch}" "${pkgbase}"
 		done
 	done
 
-	for pkgbase in ${pkgs[@]}; do
-		for arch in ${arches[@]}; do
-			checkRemovedPackage extra ${pkgbase} ${arch}
+	for pkgbase in "${pkgs[@]}"; do
+		for arch in "${ARCH_BUILD[@]}"; do
+			checkRemovedPackage extra "${pkgbase}" "${arch}"
 		done
 	done
 }
 
 testRemoveMultiplePackages() {
-	local arches=('i686' 'x86_64')
 	local pkgs=('pkg-simple-a' 'pkg-simple-b' 'pkg-split-a' 'pkg-split-b' 'pkg-simple-epoch')
 	local pkgbase
 	local arch
 
-	for pkgbase in ${pkgs[@]}; do
-		for arch in ${arches[@]}; do
-			releasePackage extra ${pkgbase} ${arch}
+	for pkgbase in "${pkgs[@]}"; do
+		for arch in "${ARCH_BUILD[@]}"; do
+			releasePackage extra "${pkgbase}" "${arch}"
 		done
 	done
 
 	../db-update
 
-	for arch in ${arches[@]}; do
-		../db-remove extra ${arch} ${pkgs[@]}
+	for arch in "${ARCH_BUILD[@]}"; do
+		../db-remove extra "${arch}" "${pkgs[@]}"
 	done
 
-	for pkgbase in ${pkgs[@]}; do
-		for arch in ${arches[@]}; do
-			checkRemovedPackage extra ${pkgbase} ${arch}
+	for pkgbase in "${pkgs[@]}"; do
+		for arch in "${ARCH_BUILD[@]}"; do
+			checkRemovedPackage extra "${pkgbase}" "${arch}"
 		done
 	done
 }
@@ -59,18 +57,18 @@ testRemoveAnyPackages() {
 	local pkgs=('pkg-any-a' 'pkg-any-b')
 	local pkgbase
 
-	for pkgbase in ${pkgs[@]}; do
-		releasePackage extra ${pkgbase} any
+	for pkgbase in "${pkgs[@]}"; do
+		releasePackage extra "${pkgbase}" any
 	done
 
 	../db-update
 
-	for pkgbase in ${pkgs[@]}; do
-		../db-remove extra any ${pkgbase}
+	for pkgbase in "${pkgs[@]}"; do
+		../db-remove extra any "${pkgbase}"
 	done
 
-	for pkgbase in ${pkgs[@]}; do
-		checkRemovedAnyPackage extra ${pkgbase}
+	for pkgbase in "${pkgs[@]}"; do
+		checkRemovedAnyPackage extra "${pkgbase}"
 	done
 }
 
diff --git a/test/test.d/db-repo-add.sh b/test/test.d/db-repo-add.sh
index 8603104..266a696 100755
--- a/test/test.d/db-repo-add.sh
+++ b/test/test.d/db-repo-add.sh
@@ -1,52 +1,50 @@
 #!/bin/bash
 
-curdir=$(readlink -e $(dirname $0))
+curdir="$(dirname "$(readlink -e "$0")")"
 . "${curdir}/../lib/common.inc"
 
 testAddSimplePackages() {
-	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 pkgbase in "${pkgs[@]}"; do
+		for arch in "${ARCH_BUILD[@]}"; do
 			cp "${pkgdir}/${pkgbase}/${pkgbase}-1-1-${arch}.pkg.tar.xz" "${FTP_BASE}/${PKGPOOL}/"
 			touch "${FTP_BASE}/${PKGPOOL}/${pkgbase}-1-1-${arch}.pkg.tar.xz.sig"
 			ln -s "${FTP_BASE}/${PKGPOOL}/${pkgbase}-1-1-${arch}.pkg.tar.xz" "${FTP_BASE}/extra/os/${arch}/"
 			ln -s "${FTP_BASE}/${PKGPOOL}/${pkgbase}-1-1-${arch}.pkg.tar.xz.sig" "${FTP_BASE}/extra/os/${arch}/"
-			../db-repo-add extra ${arch} ${pkgbase}-1-1-${arch}.pkg.tar.xz
+			../db-repo-add extra "${arch}" "${pkgbase}-1-1-${arch}.pkg.tar.xz"
 		done
 	done
 
-	for pkgbase in ${pkgs[@]}; do
-		for arch in ${arches[@]}; do
-			checkPackageDB extra ${pkgbase}-1-1-${arch}.pkg.tar.xz ${arch}
+	for pkgbase in "${pkgs[@]}"; do
+		for arch in "${ARCH_BUILD[@]}"; do
+			checkPackageDB extra "${pkgbase}-1-1-${arch}.pkg.tar.xz" "${arch}"
 		done
 	done
 }
 
 testAddMultiplePackages() {
-	local arches=('i686' 'x86_64')
 	local pkgs=('pkg-simple-a' 'pkg-simple-b')
 	local pkgbase
 	local arch
 
-	for arch in ${arches[@]}; do
+	for arch in "${ARCH_BUILD[@]}"; do
 		add_pkgs=()
-		for pkgbase in ${pkgs[@]}; do
+		for pkgbase in "${pkgs[@]}"; do
 			cp "${pkgdir}/${pkgbase}/${pkgbase}-1-1-${arch}.pkg.tar.xz" "${FTP_BASE}/${PKGPOOL}/"
 			touch "${FTP_BASE}/${PKGPOOL}/${pkgbase}-1-1-${arch}.pkg.tar.xz.sig"
 			ln -s "${FTP_BASE}/${PKGPOOL}/${pkgbase}-1-1-${arch}.pkg.tar.xz" "${FTP_BASE}/extra/os/${arch}/"
 			ln -s "${FTP_BASE}/${PKGPOOL}/${pkgbase}-1-1-${arch}.pkg.tar.xz.sig" "${FTP_BASE}/extra/os/${arch}/"
-			add_pkgs[${#add_pkgs[*]}]=${pkgbase}-1-1-${arch}.pkg.tar.xz
+			add_pkgs+=("${pkgbase}-1-1-${arch}.pkg.tar.xz")
 		done
-		../db-repo-add extra ${arch} ${add_pkgs[@]}
+		../db-repo-add extra "${arch}" "${add_pkgs[@]}"
 	done
 
-	for pkgbase in ${pkgs[@]}; do
-		for arch in ${arches[@]}; do
-			checkPackageDB extra ${pkgbase}-1-1-${arch}.pkg.tar.xz ${arch}
+	for pkgbase in "${pkgs[@]}"; do
+		for arch in "${ARCH_BUILD[@]}"; do
+			checkPackageDB extra "${pkgbase}-1-1-${arch}.pkg.tar.xz" "${arch}"
 		done
 	done
 }
diff --git a/test/test.d/db-repo-remove.sh b/test/test.d/db-repo-remove.sh
index 315d63d..727188d 100755
--- a/test/test.d/db-repo-remove.sh
+++ b/test/test.d/db-repo-remove.sh
@@ -1,56 +1,54 @@
 #!/bin/bash
 
-curdir=$(readlink -e $(dirname $0))
+curdir="$(dirname "$(readlink -e "$0")")"
 . "${curdir}/../lib/common.inc"
 
 testRemovePackages() {
-	local arches=('i686' 'x86_64')
 	local pkgs=('pkg-simple-a' 'pkg-simple-b' 'pkg-simple-epoch')
 	local pkgbase
 	local arch
 
-	for pkgbase in ${pkgs[@]}; do
-		for arch in ${arches[@]}; do
-			releasePackage extra ${pkgbase} ${arch}
+	for pkgbase in "${pkgs[@]}"; do
+		for arch in "${ARCH_BUILD[@]}"; do
+			releasePackage extra "${pkgbase}" "${arch}"
 		done
 	done
 
 	../db-update
 
-	for pkgbase in ${pkgs[@]}; do
-		for arch in ${arches[@]}; do
-			../db-repo-remove extra ${arch} ${pkgbase}
+	for pkgbase in "${pkgs[@]}"; do
+		for arch in "${ARCH_BUILD[@]}"; do
+			../db-repo-remove extra "${arch}" "${pkgbase}"
 		done
 	done
 
-	for pkgbase in ${pkgs[@]}; do
-		for arch in ${arches[@]}; do
-			checkRemovedPackageDB extra ${pkgbase} ${arch}
+	for pkgbase in "${pkgs[@]}"; do
+		for arch in "${ARCH_BUILD[@]}"; do
+			checkRemovedPackageDB extra "${pkgbase}" "${arch}"
 		done
 	done
 }
 
 testRemoveMultiplePackages() {
-	local arches=('i686' 'x86_64')
 	local pkgs=('pkg-simple-a' 'pkg-simple-b' 'pkg-simple-epoch')
 	local pkgbase
 	local arch
 
-	for pkgbase in ${pkgs[@]}; do
-		for arch in ${arches[@]}; do
-			releasePackage extra ${pkgbase} ${arch}
+	for pkgbase in "${pkgs[@]}"; do
+		for arch in "${ARCH_BUILD[@]}"; do
+			releasePackage extra "${pkgbase}" "${arch}"
 		done
 	done
 
 	../db-update
 
-	for arch in ${arches[@]}; do
-		../db-repo-remove extra ${arch} ${pkgs[@]}
+	for arch in "${ARCH_BUILD[@]}"; do
+		../db-repo-remove extra "${arch}" "${pkgs[@]}"
 	done
 
-	for pkgbase in ${pkgs[@]}; do
-		for arch in ${arches[@]}; do
-			checkRemovedPackageDB extra ${pkgbase} ${arch}
+	for pkgbase in "${pkgs[@]}"; do
+		for arch in "${ARCH_BUILD[@]}"; do
+			checkRemovedPackageDB extra "${pkgbase}" "${arch}"
 		done
 	done
 }
diff --git a/test/test.d/db-update.sh b/test/test.d/db-update.sh
index e38c328..ca4efe7 100755
--- a/test/test.d/db-update.sh
+++ b/test/test.d/db-update.sh
@@ -1,25 +1,24 @@
 #!/bin/bash
 
-curdir=$(readlink -e $(dirname $0))
+curdir="$(dirname "$(readlink -e "$0")")"
 . "${curdir}/../lib/common.inc"
 
 testAddSimplePackages() {
-	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
-			releasePackage extra ${pkgbase} ${arch}
+	for pkgbase in "${pkgs[@]}"; do
+		for arch in "${ARCH_BUILD[@]}"; do
+			releasePackage extra "${pkgbase}" "${arch}"
 		done
 	done
 
 	../db-update
 
-	for pkgbase in ${pkgs[@]}; do
-		for arch in ${arches[@]}; do
-			checkPackage extra ${pkgbase}-1-1-${arch}.pkg.tar.xz ${arch}
+	for pkgbase in "${pkgs[@]}"; do
+		for arch in "${ARCH_BUILD[@]}"; do
+			checkPackage extra "${pkgbase}-1-1-${arch}.pkg.tar.xz" "${arch}"
 		done
 	done
 }
@@ -40,36 +39,35 @@ testAddAnyPackages() {
 	local pkgs=('pkg-any-a' 'pkg-any-b')
 	local pkgbase
 
-	for pkgbase in ${pkgs[@]}; do
-		releasePackage extra ${pkgbase} any
+	for pkgbase in "${pkgs[@]}"; do
+		releasePackage extra "${pkgbase}" any
 	done
 
 	../db-update
 
-	for pkgbase in ${pkgs[@]}; do
-		checkAnyPackage extra ${pkgbase}-1-1-any.pkg.tar.xz
+	for pkgbase in "${pkgs[@]}"; do
+		checkAnyPackage extra "${pkgbase}-1-1-any.pkg.tar.xz"
 	done
 }
 
 testAddSplitPackages() {
-	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
-			releasePackage extra ${pkgbase} ${arch}
+	for pkgbase in "${pkgs[@]}"; do
+		for arch in "${ARCH_BUILD[@]}"; do
+			releasePackage extra "${pkgbase}" "${arch}"
 		done
 	done
 
 	../db-update
 
-	for pkgbase in ${pkgs[@]}; do
-		for arch in ${arches[@]}; do
-			for pkg in "${pkgdir}/${pkgbase}"/*-${arch}${PKGEXT}; do
-				checkPackage extra $(basename ${pkg}) ${arch}
+	for pkgbase in "${pkgs[@]}"; do
+		for arch in "${ARCH_BUILD[@]}"; do
+			for pkg in "${pkgdir}/${pkgbase}"/*-"${arch}"${PKGEXT}; do
+				checkPackage extra "${pkg##*/}" "${arch}"
 			done
 		done
 	done
@@ -81,8 +79,8 @@ testUpdateAnyPackage() {
 
 	pushd "${TMP}/svn-packages-copy/pkg-any-a/trunk/" >/dev/null
 	sed 's/pkgrel=1/pkgrel=2/g' -i PKGBUILD
-	svn commit -q -m"update pkg to pkgrel=2" >/dev/null
-	sudo extra-i686-build >/dev/null 2>&1
+	arch_svn commit -q -m"update pkg to pkgrel=2" >/dev/null
+	sudo extra-i686-build
 	mv pkg-any-a-1-2-any.pkg.tar.xz "${pkgdir}/pkg-any-a/"
 	popd >/dev/null
 
@@ -99,8 +97,8 @@ testUpdateAnyPackageToDifferentRepositoriesAtOnce() {
 
 	pushd "${TMP}/svn-packages-copy/pkg-any-a/trunk/" >/dev/null
 	sed 's/pkgrel=1/pkgrel=2/g' -i PKGBUILD
-	svn commit -q -m"update pkg to pkgrel=2" >/dev/null
-	sudo extra-i686-build >/dev/null 2>&1
+	arch_svn commit -q -m"update pkg to pkgrel=2" >/dev/null
+	sudo extra-i686-build
 	mv pkg-any-a-1-2-any.pkg.tar.xz "${pkgdir}/pkg-any-a/"
 	popd >/dev/null
 
@@ -134,32 +132,41 @@ testUpdateSameAnyPackageToDifferentRepositories() {
 	local arch
 	for arch in i686 x86_64; do
 		( [ -r "${FTP_BASE}/testing/os/${arch}/testing${DBEXT%.tar.*}" ] \
-			&& bsdtar -xf "${FTP_BASE}/testing/os/${arch}/testing${DBEXT%.tar.*}" -O | grep -q ${pkgbase}) \
+			&& 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.*}"
 	done
 }
 
 
 testAddIncompleteSplitPackage() {
-	local arches=('i686' 'x86_64')
 	local repo='extra'
 	local pkgbase='pkg-split-a'
 	local arch
 
-	for arch in ${arches[@]}; do
-		releasePackage ${repo} ${pkgbase} ${arch}
+	for arch in "${ARCH_BUILD[@]}"; do
+		releasePackage "${repo}" "${pkgbase}" "${arch}"
 	done
 
 	# remove a split package to make db-update fail
-	rm "${STAGING}"/extra/${pkgbase}1-*
+	rm "${STAGING}/extra/${pkgbase}1-"*
 
 	../db-update >/dev/null 2>&1 && fail "db-update should fail when a split package is missing!"
 
-	for arch in ${arches[@]}; do
+	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 -q ${pkgbase}) \
+		&& bsdtar -xf "${FTP_BASE}/${repo}/os/${arch}/${repo}${DBEXT%.tar.*}" -O | grep -q "${pkgbase}") \
 		&& fail "${pkgbase} should not be in ${repo}/os/${arch}/${repo}${DBEXT%.tar.*}"
 	done
 }
 
+testUnknownRepo() {
+	mkdir "${STAGING}/unknown/"
+	releasePackage extra 'pkg-simple-a' 'i686'
+	releasePackage unknown 'pkg-simple-b' 'i686'
+	../db-update
+	checkPackage extra 'pkg-simple-a-1-1-i686.pkg.tar.xz' 'i686'
+	[ -e "${FTP_BASE}/unknown" ] && fail "db-update pushed a package into an unknown repository"
+	rm -rf "${STAGING}/unknown/"
+}
+
 . "${curdir}/../lib/shunit2"
diff --git a/test/test.d/ftpdir-cleanup.sh b/test/test.d/ftpdir-cleanup.sh
index 20026b4..5a7afea 100755
--- a/test/test.d/ftpdir-cleanup.sh
+++ b/test/test.d/ftpdir-cleanup.sh
@@ -1,62 +1,60 @@
 #!/bin/bash
 
-curdir=$(readlink -e $(dirname $0))
+curdir="$(dirname "$(readlink -e "$0")")"
 . "${curdir}/../lib/common.inc"
 
 testCleanupSimplePackages() {
-	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
-			releasePackage extra ${pkgbase} ${arch}
+	for pkgbase in "${pkgs[@]}"; do
+		for arch in "${ARCH_BUILD[@]}"; do
+			releasePackage extra "${pkgbase}" "${arch}"
 		done
 	done
 
 	../db-update
 
-	for arch in ${arches[@]}; do
-		../db-remove extra ${arch} pkg-simple-a
+	for arch in "${ARCH_BUILD[@]}"; do
+		../db-remove extra "${arch}" pkg-simple-a
 	done
 
 	../cron-jobs/ftpdir-cleanup >/dev/null
 
-	for arch in ${arches[@]}; do
+	for arch in "${ARCH_BUILD[@]}"; do
 		local pkg1="pkg-simple-a-1-1-${arch}.pkg.tar.xz"
-		checkRemovedPackage extra 'pkg-simple-a' ${arch}
+		checkRemovedPackage extra 'pkg-simple-a' "${arch}"
 		[ -f "${FTP_BASE}/${PKGPOOL}/${pkg1}" ] && fail "${PKGPOOL}/${pkg1} found"
 		[ -f "${FTP_BASE}/${repo}/os/${arch}/${pkg1}" ] && fail "${repo}/os/${arch}/${pkg1} found"
 
 		local pkg2="pkg-simple-b-1-1-${arch}.pkg.tar.xz"
-		checkPackage extra ${pkg2} ${arch}
+		checkPackage extra "${pkg2}" "${arch}"
 	done
 }
 
 testCleanupEpochPackages() {
-	local arches=('i686' 'x86_64')
 	local pkgs=('pkg-simple-epoch')
 	local pkgbase
 	local arch
 
-	for pkgbase in ${pkgs[@]}; do
-		for arch in ${arches[@]}; do
-			releasePackage extra ${pkgbase} ${arch}
+	for pkgbase in "${pkgs[@]}"; do
+		for arch in "${ARCH_BUILD[@]}"; do
+			releasePackage extra "${pkgbase}" "${arch}"
 		done
 	done
 
 	../db-update
 
-	for arch in ${arches[@]}; do
-		../db-remove extra ${arch} pkg-simple-epoch
+	for arch in "${ARCH_BUILD[@]}"; do
+		../db-remove extra "${arch}" pkg-simple-epoch
 	done
 
 	../cron-jobs/ftpdir-cleanup >/dev/null
 
-	for arch in ${arches[@]}; do
+	for arch in "${ARCH_BUILD[@]}"; do
 		local pkg1="pkg-simple-epoch-1:1-1-${arch}.pkg.tar.xz"
-		checkRemovedPackage extra 'pkg-simple-epoch' ${arch}
+		checkRemovedPackage extra 'pkg-simple-epoch' "${arch}"
 		[ -f "${FTP_BASE}/${PKGPOOL}/${pkg1}" ] && fail "${PKGPOOL}/${pkg1} found"
 		[ -f "${FTP_BASE}/${repo}/os/${arch}/${pkg1}" ] && fail "${repo}/os/${arch}/${pkg1} found"
 	done
@@ -67,8 +65,8 @@ testCleanupAnyPackages() {
 	local pkgbase
 	local arch='any'
 
-	for pkgbase in ${pkgs[@]}; do
-		releasePackage extra ${pkgbase} any
+	for pkgbase in "${pkgs[@]}"; do
+		releasePackage extra "${pkgbase}" any
 	done
 
 	../db-update
@@ -81,39 +79,38 @@ testCleanupAnyPackages() {
 	[ -f "${FTP_BASE}/${repo}/os/${arch}/${pkg1}" ] && fail "${repo}/os/${arch}/${pkg1} found"
 
 	local pkg2="pkg-any-b-1-1-${arch}.pkg.tar.xz"
-	checkAnyPackage extra ${pkg2}
+	checkAnyPackage extra "${pkg2}"
 }
 
 testCleanupSplitPackages() {
-	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
-			releasePackage extra ${pkgbase} ${arch}
+	for pkgbase in "${pkgs[@]}"; do
+		for arch in "${ARCH_BUILD[@]}"; do
+			releasePackage extra "${pkgbase}" "${arch}"
 		done
 	done
 
 	../db-update
 
-	for arch in ${arches[@]}; do
-		../db-remove extra ${arch} ${pkgs[0]}
+	for arch in "${ARCH_BUILD[@]}"; do
+		../db-remove extra "${arch}" "${pkgs[0]}"
 	done
 
 	../cron-jobs/ftpdir-cleanup >/dev/null
 
-	for arch in ${arches[@]}; do
-		for pkg in "${pkgdir}/${pkgs[0]}"/*-${arch}${PKGEXT}; do
-			checkRemovedPackage extra ${pkgs[0]} ${arch}
+	for arch in "${ARCH_BUILD[@]}"; do
+		for pkg in "${pkgdir}/${pkgs[0]}"/*-"${arch}"${PKGEXT}; do
+			checkRemovedPackage extra "${pkgs[0]}" "${arch}"
 			[ -f "${FTP_BASE}/${PKGPOOL}/${pkg}" ] && fail "${PKGPOOL}/${pkg} found"
 			[ -f "${FTP_BASE}/${repo}/os/${arch}/${pkg}" ] && fail "${repo}/os/${arch}/${pkg} found"
 		done
 
-		for pkg in "${pkgdir}/${pkgs[1]}"/*-${arch}${PKGEXT}; do
-			checkPackage extra $(basename ${pkg}) ${arch}
+		for pkg in "${pkgdir}/${pkgs[1]}"/*-"${arch}"${PKGEXT}; do
+			checkPackage extra "${pkg##*/}" "${arch}"
 		done
 	done
 }
diff --git a/test/test.d/packages.sh b/test/test.d/packages.sh
index 488cb15..18266eb 100755
--- a/test/test.d/packages.sh
+++ b/test/test.d/packages.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-curdir=$(readlink -e $(dirname $0))
+curdir="$(dirname "$(readlink -e "$0")")"
 . "${curdir}/../lib/common.inc"
 
 testPackages() {
diff --git a/test/test.d/pool-transition.sh b/test/test.d/pool-transition.sh
deleted file mode 100755
index 5873f00..0000000
--- a/test/test.d/pool-transition.sh
+++ /dev/null
@@ -1,152 +0,0 @@
-#!/bin/bash
-
-curdir=$(readlink -e $(dirname $0))
-. "${curdir}/../lib/common.inc"
-
-testMovePackagesWithoutPool() {
-	local arches=('i686' 'x86_64')
-	local pkgs=('pkg-simple-a' 'pkg-simple-b' 'pkg-split-a' 'pkg-split-b')
-	local pkgbase
-	local arch
-	local pkg
-	local old
-
-	for pkgbase in ${pkgs[@]}; do
-		for arch in ${arches[@]}; do
-			releasePackage testing ${pkgbase} ${arch}
-		done
-	done
-
-	../db-update
-
-	# transform two packages to old style layout
-	for arch in ${arches[@]}; do
-		for old in 0 2; do
-			for pkg in "${pkgdir}/${pkgs[${old}]}"/*-${arch}${PKGEXT}; do
-				pkg=$(basename $pkg)
-				mv -f "${FTP_BASE}/${PKGPOOL}/${pkg}" "${FTP_BASE}/testing/os/${arch}/${pkg}"
-			done
-		done
-	done
-
-	../cron-jobs/ftpdir-cleanup >/dev/null
-
-	../db-move testing extra ${pkgs[@]}
-
-	../cron-jobs/ftpdir-cleanup >/dev/null
-
-	for pkgbase in ${pkgs[@]}; do
-		for arch in ${arches[@]}; do
-			for pkg in "${pkgdir}/${pkgbase}"/*-${arch}${PKGEXT}; do
-				checkPackage extra $(basename ${pkg}) ${arch}
-			done
-			checkRemovedPackage testing ${pkgbase} ${arch}
-		done
-	done
-}
-
-testUpdateAnyPackageWithoutPool() {
-	local pkgname='pkg-any-a'
-	local pkg1='pkg-any-a-1-1-any.pkg.tar.xz'
-	local pkg2='pkg-any-a-1-2-any.pkg.tar.xz'
-	local arch
-
-
-	releasePackage extra pkg-any-a any
-	../db-update
-	# transform two packages to old style layout
-	mv -f "${FTP_BASE}/${PKGPOOL}/${pkg1}" "${FTP_BASE}/extra/os/any"
-	for arch in i686 x86_64; do
-		ln -sf "../any/${pkg1}" "${FTP_BASE}/extra/os/${arch}"
-	done
-
-	pushd "${TMP}/svn-packages-copy/${pkgname}/trunk/" >/dev/null
-	sed 's/pkgrel=1/pkgrel=2/g' -i PKGBUILD
-	svn commit -q -m"update pkg to pkgrel=2" >/dev/null
-	sudo extra-i686-build >/dev/null 2>&1
-	mv "${pkg2}" "${pkgdir}/${pkgname}/"
-	popd >/dev/null
-
-	releasePackage extra ${pkgname} any
-	../db-update
-	rm -f "${pkgdir}/${pkgname}/${pkg2}"
-
-	../cron-jobs/ftpdir-cleanup >/dev/null
-
-	checkAnyPackage extra "${pkg2}"
-
-	[ -f "${FTP_BASE}/${PKGPOOL}/${pkg1}" ] && fail "${PKGPOOL}/${pkg1} found"
-	for arch in any i686 x86_64; do
-		[ -f "${FTP_BASE}/extra/os/${arch}/${pkg1}" ] && fail "extra/os/${arch}/${pkg1} found"
-	done
-}
-
-testMoveAnyPackagesWithoutPool() {
-	local pkgs=('pkg-any-a' 'pkg-any-b')
-	local pkgbase
-	local arch
-	local pkg
-
-	for pkgbase in ${pkgs[@]}; do
-		releasePackage testing ${pkgbase} any
-	done
-
-	../db-update
-
-	# transform a package to old style layout
-	for pkg in "${pkgdir}/${pkgs[0]}"/*-any${PKGEXT}; do
-		pkg=$(basename $pkg)
-		mv -f "${FTP_BASE}/${PKGPOOL}/${pkg}" "${FTP_BASE}/testing/os/any/${pkg}"
-		for arch in i686 x86_64; do
-			ln -sf "../any/${pkg}" "${FTP_BASE}/testing/os/${arch}/${pkg}"
-		done
-	done
-
-	../cron-jobs/ftpdir-cleanup >/dev/null
-
-	../db-move testing extra ${pkgs[@]}
-
-	../cron-jobs/ftpdir-cleanup >/dev/null
-
-	for pkgbase in ${pkgs[@]}; do
-		for pkg in "${pkgdir}/${pkgbase}"/*-any${PKGEXT}; do
-			checkAnyPackage extra $(basename ${pkg})
-		done
-		checkRemovedAnyPackage testing ${pkgbase}
-	done
-
-	for pkg in "${pkgdir}/${pkgs[0]}"/*-any${PKGEXT}; do
-		pkg=$(basename $pkg)
-		for arch in any i686 x86_64; do
-			[ -f "${FTP_BASE}/testing/os/${arch}/${pkg}" ] && fail "testing/os/${arch}/${pkg} found"
-		done
-	done
-}
-
-testUpdateSameAnyPackageToDifferentRepositoriesWithoutPool() {
-	local pkg
-	local arch
-
-	releasePackage extra pkg-any-a any
-	../db-update
-
-	# transform a package to old style layout
-	for pkg in "${pkgdir}/pkg-any-a"/*-any${PKGEXT}; do
-		pkg=$(basename $pkg)
-		mv -f "${FTP_BASE}/${PKGPOOL}/${pkg}" "${FTP_BASE}/extra/os/any/${pkg}"
-		for arch in i686 x86_64; do
-			ln -sf "../any/${pkg}" "${FTP_BASE}/extra/os/${arch}/${pkg}"
-		done
-	done
-
-	releasePackage testing pkg-any-a any
-	../db-update >/dev/null 2>&1 && (fail 'Adding an existing package to another repository should fail'; return 1)
-
-	for arch in i686 x86_64; do
-		( [ -r "${FTP_BASE}/testing/os/${arch}/testing${DBEXT%.tar.*}" ] \
-			&& bsdtar -xf "${FTP_BASE}/testing/os/${arch}/testing${DBEXT%.tar.*}" -O | grep -q pkg-any-a) \
-			&& fail "pkg-any-a should not be in testing/os/${arch}/testing${DBEXT%.tar.*}"
-	done
-}
-
-. "${curdir}/../lib/shunit2"
diff --git a/test/test.d/signed-packages.sh b/test/test.d/signed-packages.sh
index 5d6f4ff..3ffe146 100755
--- a/test/test.d/signed-packages.sh
+++ b/test/test.d/signed-packages.sh
@@ -1,13 +1,36 @@
 #!/bin/bash
 
-curdir=$(readlink -e $(dirname $0))
+curdir="$(dirname "$(readlink -e "$0")")"
 . "${curdir}/../lib/common.inc"
 
+testAddSignedPackage() {
+	releasePackage extra 'pkg-simple-a' 'i686'
+	../db-update || fail "db-update failed!"
+}
+
 testAddUnsignedPackage() {
 	releasePackage extra 'pkg-simple-a' 'i686'
-	# remove any signature
 	rm "${STAGING}"/extra/*.sig
 	../db-update >/dev/null 2>&1 && fail "db-update should fail when a signature is missing!"
 }
 
+testAddInvalidSignedPackage() {
+	local p
+	releasePackage extra 'pkg-simple-a' 'i686'
+	for p in "${STAGING}"/extra/*${PKGEXT}; do
+		unxz "$p"
+		xz -0 "${p%%.xz}"
+	done
+	../db-update >/dev/null 2>&1 && fail "db-update should fail when a signature is invalid!"
+}
+
+testAddBrokenSignature() {
+	local s
+	releasePackage extra 'pkg-simple-a' 'i686'
+	for s in "${STAGING}"/extra/*.sig; do
+		echo 0 > "$s"
+	done
+	../db-update >/dev/null 2>&1 && fail "db-update should fail when a signature is broken!"
+}
+
 . "${curdir}/../lib/shunit2"
diff --git a/test/test.d/sourceballs.sh b/test/test.d/sourceballs.sh
index fdcf08c..81c9265 100755
--- a/test/test.d/sourceballs.sh
+++ b/test/test.d/sourceballs.sh
@@ -1,24 +1,23 @@
 #!/bin/bash
 
-curdir=$(readlink -e $(dirname $0))
+curdir="$(dirname "$(readlink -e "$0")")"
 . "${curdir}/../lib/common.inc"
 
 testSourceballs() {
-	local arches=('i686' 'x86_64')
 	local pkgs=('pkg-simple-a' 'pkg-simple-b' 'pkg-simple-epoch')
 	local pkgbase
 	local arch
 
-	for pkgbase in ${pkgs[@]}; do
-		for arch in ${arches[@]}; do
-			releasePackage extra ${pkgbase} ${arch}
+	for pkgbase in "${pkgs[@]}"; do
+		for arch in "${ARCH_BUILD[@]}"; do
+			releasePackage extra "${pkgbase}" "${arch}"
 		done
 	done
 	../db-update
 
 	../cron-jobs/sourceballs
-	for pkgbase in ${pkgs[@]}; do
-		[ ! -r ${FTP_BASE}/${SRCPOOL}/${pkgbase}-*${SRCEXT} ] && fail "source package not found!"
+	for pkgbase in "${pkgs[@]}"; do
+		[ ! -r "${FTP_BASE}/${SRCPOOL}/${pkgbase}"-*"${SRCEXT}" ] && fail "source package not found!"
 	done
 }
 
@@ -26,59 +25,57 @@ testAnySourceballs() {
 	local pkgs=('pkg-any-a' 'pkg-any-b')
 	local pkgbase
 
-	for pkgbase in ${pkgs[@]}; do
-		releasePackage extra ${pkgbase} any
+	for pkgbase in "${pkgs[@]}"; do
+		releasePackage extra "${pkgbase}" any
 	done
 	../db-update
 
 	../cron-jobs/sourceballs
-	for pkgbase in ${pkgs[@]}; do
-		[ ! -r ${FTP_BASE}/${SRCPOOL}/${pkgbase}-*${SRCEXT} ] && fail "source package not found!"
+	for pkgbase in "${pkgs[@]}"; do
+		[ ! -r "${FTP_BASE}/${SRCPOOL}/${pkgbase}"-*"${SRCEXT}" ] && fail "source package not found!"
 	done
 }
 
 testSplitSourceballs() {
-	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
-			releasePackage extra ${pkgbase} ${arch}
+	for pkgbase in "${pkgs[@]}"; do
+		for arch in "${ARCH_BUILD[@]}"; do
+			releasePackage extra "${pkgbase}" "${arch}"
 		done
 	done
 
 	../db-update
 
 	../cron-jobs/sourceballs
-	for pkgbase in ${pkgs[@]}; do
-		[ ! -r ${FTP_BASE}/${SRCPOOL}/${pkgbase}-*${SRCEXT} ] && fail "source package not found!"
+	for pkgbase in "${pkgs[@]}"; do
+		[ ! -r "${FTP_BASE}/${SRCPOOL}/${pkgbase}"-*"${SRCEXT}" ] && fail "source package not found!"
 	done
 }
 
 testSourceballsCleanup() {
-	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
-			releasePackage extra ${pkgbase} ${arch}
+	for pkgbase in "${pkgs[@]}"; do
+		for arch in "${ARCH_BUILD[@]}"; do
+			releasePackage extra "${pkgbase}" "${arch}"
 		done
 	done
 	../db-update
 	../cron-jobs/sourceballs
 
-	for arch in ${arches[@]}; do
-		../db-remove extra ${arch} pkg-simple-a
+	for arch in "${ARCH_BUILD[@]}"; do
+		../db-remove extra "${arch}" pkg-simple-a
 	done
 
 	../cron-jobs/sourceballs
-	[ -r ${FTP_BASE}/${SRCPOOL}/pkg-simple-a-*${SRCEXT} ] && fail "source package was not removed!"
-	[ ! -r ${FTP_BASE}/${SRCPOOL}/pkg-simple-b-*${SRCEXT} ] && fail "source package not found!"
+	[ -r "${FTP_BASE}/${SRCPOOL}/pkg-simple-a"-*"${SRCEXT}" ] && fail "source package was not removed!"
+	[ ! -r "${FTP_BASE}/${SRCPOOL}/pkg-simple-b"-*"${SRCEXT}" ] && fail "source package not found!"
 }
 
 . "${curdir}/../lib/shunit2"
diff --git a/test/test.d/testing2x.sh b/test/test.d/testing2x.sh
index eda6cd6..c611ce4 100755
--- a/test/test.d/testing2x.sh
+++ b/test/test.d/testing2x.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-curdir=$(readlink -e $(dirname $0))
+curdir="$(dirname "$(readlink -e "$0")")"
 . "${curdir}/../lib/common.inc"
 
 testTesting2xAnyPackage() {
@@ -9,8 +9,8 @@ testTesting2xAnyPackage() {
 
 	pushd "${TMP}/svn-packages-copy/pkg-any-a/trunk/" >/dev/null
 	sed 's/pkgrel=1/pkgrel=2/g' -i PKGBUILD
-	svn commit -q -m"update pkg to pkgrel=2" >/dev/null
-	sudo extra-i686-build >/dev/null 2>&1
+	arch_svn commit -q -m"update pkg to pkgrel=2" >/dev/null
+	sudo extra-i686-build
 	mv pkg-any-a-1-2-any.pkg.tar.xz "${pkgdir}/pkg-any-a/"
 	popd >/dev/null
 
-- 
cgit v1.2.3