]> git.saurik.com Git - apt.git/commitdiff
test: Allow moreutils-parallel instead of parallel
authorJulian Andres Klode <jak@debian.org>
Tue, 23 Aug 2016 21:14:05 +0000 (23:14 +0200)
committerJulian Andres Klode <jak@debian.org>
Fri, 26 Aug 2016 20:17:55 +0000 (22:17 +0200)
That's what it's called on FreeBSD.

Gbp-Dch: ignore

test/integration/run-tests

index 78f24fbaf024e8f52784b80868fc8258f6e1ef75..fad249994dd6b434bb68fcca95407f281d78090a 100755 (executable)
@@ -89,7 +89,11 @@ if [ -n "$APT_TEST_JOBS" ]; then
        if [ "$MSGCOLOR" != 'NO' ]; then
                export MSGCOLOR='ALWAYS'
        fi
        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
 fi
 TOTAL="$(echo "$TESTLIST" | wc -l)"
 for testcase in $TESTLIST; do