test: check for GNU parallel with --version options

The lastest versions of GNU parallel no longer make mention of GNU
within their help output. This causes the test script to mistakenly use
the moreutils parallel execution. In order to fix this, while
maintaining compatibility with previous versions of GNU parallel,
--version should be used.

Signed-off-by: Tobias Backer Dirks <omgitsaheadcrab@gmail.com>
This commit is contained in:
Tobias Backer Dirks 2021-04-24 21:41:03 +01:00 committed by David Bremner
parent f8463d7374
commit f2b5ad28e2

View file

@ -50,7 +50,7 @@ META_FAILURE=
# Run the tests # Run the tests
if test -z "$NOTMUCH_TEST_SERIALIZE" && command -v parallel >/dev/null ; then if test -z "$NOTMUCH_TEST_SERIALIZE" && command -v parallel >/dev/null ; then
test -t 1 && export COLORS_WITHOUT_TTY=t || : test -t 1 && export COLORS_WITHOUT_TTY=t || :
if parallel -h | grep -q GNU ; then if parallel --version | grep -q GNU ; then
echo "INFO: running tests with GNU parallel" echo "INFO: running tests with GNU parallel"
printf '%s\n' $TESTS | $TEST_TIMEOUT_CMD parallel printf '%s\n' $TESTS | $TEST_TIMEOUT_CMD parallel
else else