diff options
| author | Julian Andres Klode <jak@debian.org> | 2025-02-14 18:30:53 +0000 |
|---|---|---|
| committer | Julian Andres Klode <jak@debian.org> | 2025-02-14 18:30:53 +0000 |
| commit | e67988237374fb6181b163a0d2470f367b514c80 (patch) | |
| tree | 0c3b934f340208eda237bbca1d5f31581008d93e /test/integration/run-tests | |
| parent | 85eeadde2aefeb0bea1eff4dc2456eec8a405d05 (diff) | |
| parent | 9b36a29ffebde3088cec2048505b8d644f46c2c3 (diff) | |
Merge branch 'solver3' into 'main'
Get 3.0 solver mostly in shape
See merge request apt-team/apt!451
Diffstat (limited to 'test/integration/run-tests')
| -rwxr-xr-x | test/integration/run-tests | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/integration/run-tests b/test/integration/run-tests index e52214e0a..9399f28e9 100755 --- a/test/integration/run-tests +++ b/test/integration/run-tests @@ -61,7 +61,7 @@ if [ -n "$TESTTORUN" ]; then CURRENTTRAP="rm -f \"$OUTPUT\"; $CURRENTTRAP" trap "$CURRENTTRAP" 0 HUP INT QUIT ILL ABRT FPE SEGV PIPE TERM { - if [ "$APT_SKIP_TEST_FILE" ] && grep -qFx "${TESTTORUN##*/}" "$APT_SKIP_TEST_FILE"; then + if [ "$APT_SKIP_TEST_FILE" ] && sed 's/ *#.*//' "$APT_SKIP_TEST_FILE" | grep -qFx "${TESTTORUN##*/}"; then if [ "$MSGLEVEL" -le 2 ]; then printf "${CTEST}Skip Testcase ${CHIGH}${TESTTORUN##*/}${CRESET}" else @@ -117,7 +117,7 @@ FAILED_TESTS="" DIR="$(readlink -f "$(dirname "$0")")" cd "$DIR" if [ -e "$TESTLIST" ]; then - TESTLIST="$(sort < "$TESTLIST" | sed 's#^#./#')" + TESTLIST="$(sort < "$TESTLIST" | sed 's#^#./#;s/ *#.*//')" else TESTLIST="$(find . -mindepth 1 -maxdepth 1 -regex '^\./test-[^/]*$' | sort)" fi |