diff options
| author | Tobias Backer Dirks <omgitsaheadcrab@gmail.com> | 2021-04-24 21:41:03 +0100 |
|---|---|---|
| committer | David Bremner <david@tethera.net> | 2021-04-24 20:06:41 -0300 |
| commit | f2b5ad28e2b7b512d66946af34dd4149d1506bf4 (patch) | |
| tree | 5ff1c7552c1db9514608794a5a2b63830bd1bc5b /test/notmuch-test | |
| parent | f8463d737473ce43461da7022fa31ac3956b5036 (diff) | |
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>
Diffstat (limited to 'test/notmuch-test')
| -rwxr-xr-x | test/notmuch-test | 2 |
1 files changed, 1 insertions, 1 deletions
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 |