Просмотр исходного кода

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

David Kalnischkies лет назад: 16
Родитель
Сommit
2c6baa5a1f
1 измененных файлов с 2 добавлено и 2 удалено
  1. 2 2
      test/integration/framework

+ 2 - 2
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