From f67e9858fd0f12c2b8aa6ca9450cde427513d883 Mon Sep 17 00:00:00 2001 From: Arnaud Rebillout Date: Wed, 12 Feb 2025 20:50:48 +0700 Subject: test: Fix skipping test cases The `--skip` option was introduced in commit 1fbdc04be7547b8c4bb84f400329415ea0bc60b5, and it was broken straight from the start for the case where `TESTTORUN` is not set (see last hunk in this commit, the mistake is obvious). It went unnoticed as the GitLab CI runs tests with the `-j` option, so `TESTTORUN` is set. While ci.debian.net runs without -j, but doesn't skip any test, so it doesn't trigger the bug either. --- test/integration/run-tests | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'test/integration') diff --git a/test/integration/run-tests b/test/integration/run-tests index 24d0cc00f..e52214e0a 100755 --- a/test/integration/run-tests +++ b/test/integration/run-tests @@ -161,8 +161,8 @@ if [ "$MSGLEVEL" -le 1 ]; then printf "${CTEST}Running testcases${CRESET}: " fi for testcase in $TESTLIST; do - if [ "$APT_SKIP_TEST_FILE" ] && grep -qFx "${TESTTORUN##*/}" "$APT_SKIP_TEST_FILE"; then - printf "${CTEST}Skipping Testcase ${CHIGH}${TESTTORUN##*/}${CRESET}\n" + if [ "$APT_SKIP_TEST_FILE" ] && grep -qFx "${testcase##*/}" "$APT_SKIP_TEST_FILE"; then + printf "${CTEST}Skipping Testcase ${CHIGH}${testcase##*/}${CRESET}\n" continue fi if [ "$MSGLEVEL" -le 1 ]; then -- cgit v1.2.3-70-g09d2