summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Kalnischkies <david@kalnischkies.de>2022-01-03 11:21:12 +0100
committerDavid Kalnischkies <david@kalnischkies.de>2022-02-02 13:18:09 +0100
commit794cd4a23b7cb8c0e195f8264d372203cccec8ca (patch)
tree7b0241af07187c9687efa0b44670137d2ce36f4c
parentc78f297cd0b63d8d9fd4efa71a992c214517f597 (diff)
Use moreutils parallel even if GNU parallel is installed
GNU parallel diverts moreutils implementation away. As we us moreutils features just installing parallel breaks the test runner hence. We have this already for another naming scheme, so fixing this is easy enough. Gbp-Dch: Ignore
-rwxr-xr-xtest/integration/run-tests2
1 files changed, 2 insertions, 0 deletions
diff --git a/test/integration/run-tests b/test/integration/run-tests
index 80f1fc61d..f5a39f244 100755
--- a/test/integration/run-tests
+++ b/test/integration/run-tests
@@ -104,6 +104,8 @@ if [ -n "$APT_TEST_JOBS" ]; then
parallel=parallel
if command -v moreutils-parallel >/dev/null 2>&1; then
parallel=moreutils-parallel
+ elif command -v parallel.moreutils >/dev/null 2>&1; then
+ parallel=parallel.moreutils
fi
exec $parallel -j "$APT_TEST_JOBS" "./$(basename "$0")" -- $(echo "$TESTLIST")
fi