summaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorRichard Lau <riclau@uk.ibm.com>2019-03-28 21:07:19 +0000
committerRich Trott <rtrott@gmail.com>2019-03-29 19:59:55 -0700
commit58bf61524df078ed2563725aa5e982bed51a4853 (patch)
tree36635772baaba34d3f33b6c6a279fdf2bbf715b8 /.travis.yml
parent7ef3acb62651046f542f246d26182b21c6b620a5 (diff)
downloadandroid-node-v8-58bf61524df078ed2563725aa5e982bed51a4853.tar.gz
android-node-v8-58bf61524df078ed2563725aa5e982bed51a4853.tar.bz2
android-node-v8-58bf61524df078ed2563725aa5e982bed51a4853.zip
build: fix skipping of flaky tests on Travis
`PARALLEL_ARGS` is overwritten in the Makefile if `JOBS` is set. Use `CI_JS_SUITES` instead. PR-URL: https://github.com/nodejs/node/pull/27002 Reviewed-By: Refael Ackermann <refack@gmail.com> Reviewed-By: Rich Trott <rtrott@gmail.com>
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index 4ab46e5b1b..87f4c38687 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -49,4 +49,4 @@ matrix:
- ./configure
- make -j2 V=
script:
- - PARALLEL_ARGS='--flaky-tests=skip' make -j1 test
+ - CI_JS_SUITES='--flaky-tests=skip default' make -j1 test