diff options
| author | David Kalnischkies <kalnischkies@gmail.com> | 2010-09-02 15:24:44 +0200 |
|---|---|---|
| committer | David Kalnischkies <kalnischkies@gmail.com> | 2010-09-02 15:24:44 +0200 |
| commit | 2c6baa5a1f935eb3b8d4eb9fdef62e696416e27a (patch) | |
| tree | 97809e2e38482d3d7f124b30552a0936adf4d405 | |
| parent | 99aa69c74f27a70d585510b817561fbf20ac7fb5 (diff) | |
| download | apt-2c6baa5a1f935eb3b8d4eb9fdef62e696416e27a.tar.gz | |
do the right thing(TM) even if the (unfinished) testcase is named
skip-* instead of test-* to avoid calling him with run-tests
| -rw-r--r-- | test/integration/framework | 4 |
1 files changed, 2 insertions, 2 deletions
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 |