From: Tobias Backer Dirks <omgitsaheadcrab@gmail.com>
Date: Sat, 24 Apr 2021 20:41:03 +0000 (+0100)
Subject: test: check for GNU parallel with --version options
X-Git-Tag: archive/debian/0.32_rc2-1~7
X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=f2b5ad28e2b7b512d66946af34dd4149d1506bf4

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>
---

diff --git a/test/notmuch-test b/test/notmuch-test
index b58fd3b3..91909264 100755
--- a/test/notmuch-test
+++ b/test/notmuch-test
@@ -50,7 +50,7 @@ META_FAILURE=
 # Run the tests
 if test -z "$NOTMUCH_TEST_SERIALIZE" && command -v parallel >/dev/null ; then
     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"
         printf '%s\n' $TESTS | $TEST_TIMEOUT_CMD parallel
     else