summaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorrl1987 <rl1987@sdf.lonestar.org>2018-10-19 21:40:12 +0300
committerNick Mathewson <nickm@torproject.org>2018-10-29 15:18:07 -0400
commitccdb7a1cf97a326fa2193a410a7b6d2ecf54d012 (patch)
tree182026db2683f44a1dd3e0d5adfba1943eefe365 /.travis.yml
parent739b22c23adb0a6b7391c2241d878a76b6a3b641 (diff)
downloadtor-ccdb7a1cf97a326fa2193a410a7b6d2ecf54d012.tar.gz
tor-ccdb7a1cf97a326fa2193a410a7b6d2ecf54d012.zip
Make sure we're not running distcheck and test-stem on the same CI job
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 842e31cc71..39ed6132cc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -208,7 +208,7 @@ script:
## We run `make check` because that's what https://jenkins.torproject.org does.
- if [[ "$DISTCHECK" == "" && "$TEST_STEM" == "" ]]; then make check; fi
- if [[ "$TEST_STEM" != "" ]]; then make src/app/tor test-stem; fi
- - if [[ "$DISTCHECK" != "" ]]; then make distcheck DISTCHECK_CONFIGURE_FLAGS="$CONFIGURE_FLAGS"; fi
+ - if [[ "$DISTCHECK" != "" && "$TEST_STEM" == "" ]]; then make distcheck DISTCHECK_CONFIGURE_FLAGS="$CONFIGURE_FLAGS"; fi
after_failure:
## configure will leave a log file with more details of config failures.