randomize acquire order for same type index files

[apt.git] / test / integration / run-tests

diff --git a/test/integration/run-tests b/test/integration/run-tests
index f2a2661397f0ca2cc70ca445933fe8d321cc3f57..fad249994dd6b434bb68fcca95407f281d78090a 100755 (executable)
--- a/test/integration/run-tests
+++ b/test/integration/run-tests
@@ -83,12 +83,17 @@ PASS=0
 ALL=0
 FAILED_TESTS=""
 DIR="$(readlink -f "$(dirname "$0")")"
-TESTLIST="$(run-parts --list "$DIR" --regex '^test-.*$')"
+cd "$DIR"
+TESTLIST="$(find . -mindepth 1 -maxdepth 1 -regex '^\./test-[^/]*$' | sort)"
 if [ -n "$APT_TEST_JOBS" ]; then
        if [ "$MSGCOLOR" != 'NO' ]; then
                export MSGCOLOR='ALWAYS'
        fi
-       exec parallel -j "$APT_TEST_JOBS" "$0" -- $(echo "$TESTLIST")
+       parallel=parallel
+       if command -v moreutils-parallel >/dev/null 2>&1; then
+               parallel=moreutils-parallel
+       fi
+       exec $parallel -j "$APT_TEST_JOBS" "./$(basename "$0")" -- $(echo "$TESTLIST")
 fi
 TOTAL="$(echo "$TESTLIST" | wc -l)"
 for testcase in $TESTLIST; do