From: David Kalnischkies <kalnischkies@gmail.com>
Date: Thu, 2 Sep 2010 13:24:44 +0000 (+0200)
Subject: do the right thing(TM) even if the (unfinished) testcase is named
X-Git-Tag: 0.8.3~3^2~3^2
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/2c6baa5a1f935eb3b8d4eb9fdef62e696416e27a?ds=inline;hp=-c

do the right thing(TM) even if the (unfinished) testcase is named
skip-* instead of test-* to avoid calling him with run-tests
---

2c6baa5a1f935eb3b8d4eb9fdef62e696416e27a
diff --git a/test/integration/framework b/test/integration/framework
index e55563544..d832bedbe 100644
--- a/test/integration/framework
+++ b/test/integration/framework
@@ -91,7 +91,7 @@ setupenvironment() {
 	mkdir -p etc/apt/apt.conf.d etc/apt/sources.list.d etc/apt/trusted.gpg.d etc/apt/preferences.d
 	mkdir -p var/cache var/lib var/log
 	mkdir -p var/lib/dpkg/info var/lib/dpkg/updates var/lib/dpkg/triggers
-	local STATUSFILE=$(echo "$(basename $0)" | sed 's/^test-/status-/')
+	local STATUSFILE=$(echo "$(basename $0)" | sed -e 's/^test-/status-/' -e 's/^skip-/status-/')
 	if [ -f "${TESTDIR}/${STATUSFILE}" ]; then
 		cp "${TESTDIR}/${STATUSFILE}" var/lib/dpkg/status
 	else
@@ -101,7 +101,7 @@ setupenvironment() {
 	mkdir -p usr/lib/apt
 	ln -s ${BUILDDIRECTORY}/methods usr/lib/apt/methods
 	cd ..
-	local PACKAGESFILE=$(echo "$(basename $0)" | sed 's/^test-/Packages-/')
+	local PACKAGESFILE=$(echo "$(basename $0)" | sed -e 's/^test-/Packages-/' -e 's/^skip-/Packages-/')
 	if [ -f "${TESTDIR}/${PACKAGESFILE}" ]; then
 		cp "${TESTDIR}/${PACKAGESFILE}" aptarchive/Packages
 	else