summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.travis.yml5
1 files changed, 2 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml
index cc568e088b..d2bc85d664 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -280,8 +280,7 @@ env:
env:
- CONFIG_FLAG=--with-opt-dir=/usr/local/opt/openssl@1.1:/usr/local/opt/zlib
# Not using $JOBS which might be harmful for some tests because osx build often hangs for unknown reasons.
- # Using -v because we're too lazy to build hard timeout for each test and thus can't easily detect which test is hanging forever without -v.
- - TEST_ALL_OPTS="-v --tty=no --excludes=\$(TESTSDIR)/excludes/_travis/osx"
+ - TEST_ALL_OPTS="--tty=no --excludes=\$(TESTSDIR)/excludes/_travis/osx"
# Also globally disabling $JOBS because even just building ruby could hang forever on osx.
- JOBS=
@@ -370,7 +369,7 @@ before_script:
script:
- $SETARCH make -s test TESTOPTS="${TESTOPTS=$JOBS -q --tty=no}"
- - $SETARCH make -s test-all -o exts TESTOPTS="${TEST_ALL_OPTS=$TESTOPTS}"
+ - $SETARCH travis_wait 30 make -s test-all -o exts TESTOPTS="${TEST_ALL_OPTS=$TESTOPTS}"
- $SETARCH make -s test-spec MSPECOPT=-ff # not using `-j` because sometimes `mspec -j` silently dies
# Branch matrix. Not all branches are Travis-ready so we limit branches here.