From ccdb7a1cf97a326fa2193a410a7b6d2ecf54d012 Mon Sep 17 00:00:00 2001 From: rl1987 Date: Fri, 19 Oct 2018 21:40:12 +0300 Subject: [PATCH] Make sure we're not running distcheck and test-stem on the same CI job --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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.