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/db-repo-remove.sh | 38 ++++++++++++++++++--------------------
 1 file changed, 18 insertions(+), 20 deletions(-)

(limited to 'test/test.d/db-repo-remove.sh')

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
 }
-- 
cgit v1.2.3