From 794cd4a23b7cb8c0e195f8264d372203cccec8ca Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Mon, 3 Jan 2022 11:21:12 +0100 Subject: 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 --- test/integration/run-tests | 2 ++ 1 file changed, 2 insertions(+) (limited to 'test/integration') 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 -- cgit v1.2.3-70-g09d2