X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=test%2Fnotmuch-test;h=8e483383f79d67aa7d87c04949e51407ddb7542d;hb=75bdce79527571c12c5de0c630747d6262b73fbd;hp=a4b7a1eb0b54dfbbda2c24ce7603424e7ed887c3;hpb=908d930d221413633ab7541f97eb7cf07bfc4a91;p=notmuch

diff --git a/test/notmuch-test b/test/notmuch-test
index a4b7a1eb..8e483383 100755
--- a/test/notmuch-test
+++ b/test/notmuch-test
@@ -32,15 +32,17 @@ rm -rf $NOTMUCH_BUILDDIR/test/test-results
 
 # Test for timeout utility
 if command -v timeout >/dev/null; then
-    TEST_TIMEOUT_CMD="timeout 2m"
-    echo "INFO: using 2 minute timeout for tests"
+    TEST_TIMEOUT=${NOTMUCH_TEST_TIMEOUT:-2m}
+    TEST_TIMEOUT_CMD="timeout $TEST_TIMEOUT"
+    echo "INFO: using $TEST_TIMEOUT timeout for tests"
 else
     TEST_TIMEOUT_CMD=""
 fi
 
 trap 'e=$?; kill $!; exit $e' HUP INT TERM
 # Run the tests
-if 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 || :
     if parallel -h | grep -q GNU ; then
         echo "INFO: running tests with GNU parallel"
         printf '%s\n' $TESTS | $TEST_TIMEOUT_CMD parallel
@@ -48,6 +50,11 @@ if command -v parallel >/dev/null ; then
         echo "INFO: running tests with moreutils parallel"
         $TEST_TIMEOUT_CMD parallel -- $TESTS
     fi
+    RES=$?
+    if [[ $RES != 0 ]]; then
+        echo "parallel test suite returned error code $RES"
+        exit $RES
+    fi
 else
     for test in $TESTS; do
         $TEST_TIMEOUT_CMD $test "$@" &