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 e90b4b7558eb13c3b45d04cc5b968fb0c6b9575e..fad249994dd6b434bb68fcca95407f281d78090a 100755 (executable)
--- a/test/integration/run-tests
+++ b/test/integration/run-tests
@@ -1,10 +1,4 @@
 #!/bin/sh
-
-TESTDIR="$(readlink -f "$(dirname "$0")")"
-. "$TESTDIR/framework"
-
-find_project_binary_dir
-
 set -e
 
 TESTTORUN=''
@@ -95,7 +89,11 @@ if [ -n "$APT_TEST_JOBS" ]; then
        if [ "$MSGCOLOR" != 'NO' ]; then
                export MSGCOLOR='ALWAYS'
        fi
-       exec parallel -j "$APT_TEST_JOBS" "./$(basename "$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