X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/966640d8fd2feac29909a22415955b3ce5779dcd..782c60a6bf7dddcc71dbdbc4a0eea85824076fa9:/test/integration/test-bug-590438-broken-provides-thanks-to-remove-order

diff --git a/test/integration/test-bug-590438-broken-provides-thanks-to-remove-order b/test/integration/test-bug-590438-broken-provides-thanks-to-remove-order
index bb10c4f73..76107520e 100755
--- a/test/integration/test-bug-590438-broken-provides-thanks-to-remove-order
+++ b/test/integration/test-bug-590438-broken-provides-thanks-to-remove-order
@@ -1,12 +1,12 @@
 #!/bin/sh
 set -e
 
-local TESTDIR=$(readlink -f $(dirname $0))
-. $TESTDIR/framework
+TESTDIR="$(readlink -f "$(dirname "$0")")"
+. "$TESTDIR/framework"
 
 setupenvironment
 configarchitecture "i386"
-setupflataptarchive
+setupaptarchive
 
 pkgbasefile="Package: base-files
 Status: install ok installed
@@ -24,36 +24,73 @@ Size: 73986
 MD5sum: 8489687ce10e656babd467c9ee389349
 Description-de: Verschiedene Dateien für das Basis-System von Debian"
 
-predependstest() {
-# 	rm rootdir/var/cache/apt/*.bin
-	cp $TESTDIR/$(echo "$(basename $0)" | sed 's/test-/status-/') rootdir/var/lib/dpkg/status
+predependsgawk() {
+	cp "$TESTDIR/$(echo "$(basename "$0")" | sed 's/test-/status-/')" rootdir/var/lib/dpkg/status
 	echo "$pkgbasefile
 Pre-Depends: $1
 " >> rootdir/var/lib/dpkg/status
-	testequal "Inst gawk (1:3.1.7.dfsg-5 localhost [i386])
+	testsuccessequal "Inst gawk (1:3.1.7.dfsg-5 localhost [i386])
 Conf gawk (1:3.1.7.dfsg-5 localhost [i386])
 Remv mawk [1.3.3-15]" aptget install gawk mawk- -sqq -o PreDepends=$(echo "$1" | sed 's/ //g')
 }
 
-predependstest "gawk | mawk"
-predependstest "mawk | gawk"
+predependsgawk "gawk | mawk"
+predependsgawk "mawk | gawk"
 
-predependstest "aawk | mawk | gawk"
-predependstest "aawk | gawk | mawk"
+predependsgawk "aawk | mawk | gawk"
+predependsgawk "aawk | gawk | mawk"
 
-predependstest "gawk | awk"
-predependstest "aawk | gawk | awk"
+predependsgawk "gawk | awk"
+predependsgawk "aawk | gawk | awk"
 
-predependstest "mawk | awk"
+predependsgawk "mawk | awk"
 
-predependstest "awk | gawk"
-predependstest "awk | gawk | aawk"
+predependsgawk "awk | gawk"
+predependsgawk "awk | gawk | aawk"
 
-predependstest "awk | mawk"
+predependsgawk "awk | mawk"
 
-predependstest "aawk | awk"
-predependstest "awk | aawk"
+predependsgawk "aawk | awk"
+predependsgawk "awk | aawk"
 
-predependstest "awk"
+predependsgawk "awk"
 
-# aptget install gawk mawk- -sqq -o Debug::pkgOrderList=1 #-o Debug::pkgPackageManager=1
+predependsgawk2() {
+	cp "$TESTDIR/$(echo "$(basename "$0")" | sed 's/test-/status-/')" rootdir/var/lib/dpkg/status
+	echo "$pkgbasefile
+Pre-Depends: $1
+" >> rootdir/var/lib/dpkg/status
+	testequalor2 "Inst coolstuff (1-1 localhost [all])
+Conf coolstuff (1-1 localhost [all])
+Inst gawk2 (1:3.1.7.dfsg-5 localhost [i386])
+Conf gawk2 (1:3.1.7.dfsg-5 localhost [i386])
+Remv mawk [1.3.3-15]" "Inst coolstuff (1-1 localhost [all])
+Inst gawk2 (1:3.1.7.dfsg-5 localhost [i386])
+Conf coolstuff (1-1 localhost [all])
+Conf gawk2 (1:3.1.7.dfsg-5 localhost [i386])
+Remv mawk [1.3.3-15]" aptget install gawk2 mawk- -sqq -o PreDepends=$(echo "$1" | sed 's/ //g')
+}
+
+predependsgawk2 "gawk2 | mawk"
+predependsgawk2 "mawk | gawk2"
+
+predependsgawk2 "aawk | mawk | gawk2"
+predependsgawk2 "aawk | gawk2 | mawk"
+
+predependsgawk2 "gawk2 | awk"
+predependsgawk2 "aawk | gawk2 | awk"
+
+predependsgawk2 "mawk | awk"
+
+predependsgawk2 "awk | gawk2"
+predependsgawk2 "awk | gawk2 | aawk"
+
+predependsgawk2 "awk | mawk"
+
+predependsgawk2 "aawk | awk"
+predependsgawk2 "awk | aawk"
+
+predependsgawk2 "awk"
+
+
+# aptget install gawk2 mawk- -s #-o Debug::pkgOrderList=1 #-o Debug::pkgPackageManager=1