From 78da58ec0c1cdbda6cdd22c63f85ddac703bb0d6 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Sun, 26 Oct 2025 07:58:43 +0100 Subject: tests: Do not skip tests for --solver internal Remove the exports for the default as we don't want those inherited, they can just be reset. Set the skip file to /dev/null when a solver is selected, to make sure that tests don't fall back to the default skip file. --- test/integration/run-tests | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'test/integration') diff --git a/test/integration/run-tests b/test/integration/run-tests index f5f6b6c57..47724450d 100755 --- a/test/integration/run-tests +++ b/test/integration/run-tests @@ -2,8 +2,8 @@ set -e TESTTORUN='' -export APT_SOLVER="${APT_SOLVER:-3.0}" -export APT_SKIP_TEST_FILE="${APT_SKIP_TEST_FILE:-solver3.broken}" +APT_SOLVER="${APT_SOLVER:-3.0}" +APT_SKIP_TEST_FILE="${APT_SKIP_TEST_FILE:-solver3.broken}" while [ -n "$1" ]; do if [ "$1" = "-q" ]; then export MSGLEVEL=2 @@ -26,7 +26,7 @@ while [ -n "$1" ]; do shift elif [ "$1" = '--solver' ]; then export APT_SOLVER="$2" - unset APT_SKIP_TEST_FILE + export APT_SKIP_TEST_FILE="/dev/null" shift elif [ "$1" = '--skip' ]; then export APT_SKIP_TEST_FILE="$2" -- cgit v1.2.3-70-g09d2