summaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-11-12 08:18:35 (GMT)
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-11-12 08:18:35 (GMT)
commit2dae9b36f98680b46cf3879e6dd501a3d2cc5196 (patch)
tree5cc02a27c5049be641d2c2aca62c3fa6a1e7f48a /.travis.yml
parent3208db7fb3403dfbfd1e81cc4b531f36d5cd5fff (diff)
.travis.yml: resurrect -j on mac
The "osx build randomly fails with `-j`" happens on make -j test-all. Should be safe to do make -j all. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@65686 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml8
1 files changed, 4 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml
index 8652e7d..e94c5f9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -250,7 +250,7 @@ addons:
<<: *osx
env:
- "CONFIG_FLAG='--with-opt-dir=/usr/local/opt/openssl@1.1:/usr/local/opt/zlib'"
- - "JOBS=" # osx build randomly fails with `-j`
+ - "JOBS=\"-j`sysctl -n hw.activecpu`\""
# `-v` prints too long outputs, but sometimes it osx build hangs and we can't know which test is bad without `-v`.
- "TEST_ALL_TESTOPTS='-v --color=never --job-status=normal --excludes=$(TESTSDIR)/excludes/_travis'"
@@ -313,9 +313,9 @@ before_script:
script:
- "$SETARCH make -s test TESTOPTS=--color=never"
- - "export TEST_ALL_TESTOPTS=\"${TEST_ALL_TESTOPTS:- -q --color=never --job-status=normal}\""
- - "$SETARCH make -s $JOBS test-all -o exts TESTOPTS=\"$TEST_ALL_TESTOPTS\""
- - "$SETARCH make -s $JOBS test-spec MSPECOPT=-fs" # not using `-j` because sometimes `mspec -j` silently dies
+ - "export TEST_ALL_TESTOPTS=\"${TEST_ALL_TESTOPTS:- $JOBS -q --color=never --job-status=normal}\""
+ - "$SETARCH make -s test-all -o exts TESTOPTS=\"$TEST_ALL_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.
branches: