From 908d930d221413633ab7541f97eb7cf07bfc4a91 Mon Sep 17 00:00:00 2001 From: Jameson Graef Rollins Date: Sat, 4 May 2019 20:57:43 +0000 Subject: [PATCH] tests: run all tests in parallel, if available If either the moreutils or GNU parallel utility are available, run all tests in parallel. On my eight core machine this makes for a ~x7 speed-up in the full test suite (1m24s -> 12s). The design of the test suite makes this parallelization trivial. --- test/notmuch-test | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/test/notmuch-test b/test/notmuch-test index 1a1ae811..a4b7a1eb 100755 --- a/test/notmuch-test +++ b/test/notmuch-test @@ -40,17 +40,27 @@ fi trap 'e=$?; kill $!; exit $e' HUP INT TERM # Run the tests -for test in $TESTS; do - $TEST_TIMEOUT_CMD $test "$@" & - wait $! - # If the test failed without producing results, then it aborted, - # so we should abort, too. - RES=$? - testname=$(basename $test .sh) - if [[ $RES != 0 && ! -e "$NOTMUCH_BUILDDIR/test/test-results/$testname" ]]; then - exit $RES +if command -v parallel >/dev/null ; then + if parallel -h | grep -q GNU ; then + echo "INFO: running tests with GNU parallel" + printf '%s\n' $TESTS | $TEST_TIMEOUT_CMD parallel + else + echo "INFO: running tests with moreutils parallel" + $TEST_TIMEOUT_CMD parallel -- $TESTS fi -done +else + for test in $TESTS; do + $TEST_TIMEOUT_CMD $test "$@" & + wait $! + # If the test failed without producing results, then it aborted, + # so we should abort, too. + RES=$? + testname=$(basename $test .sh) + if [[ $RES != 0 && ! -e "$NOTMUCH_BUILDDIR/test/test-results/$testname" ]]; then + exit $RES + fi + done +fi trap - HUP INT TERM # Report results -- 2.43.0