commit eaeda21da168e04b70659a0e17077114dd419ba6 Author: teor teor@torproject.org Date: Fri Feb 14 10:38:40 2020 +1000

Travis: Make Chutney output more readable

* Use a shorter name for the chutney make target * Put the chutney make target first, when using a custom target

Part of 33280. --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml index e8533c08a..c6468f78f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -35,7 +35,7 @@ env: ## triggered by Ubuntu Xenial and Bionic. See #32722. - CHUTNEY_TOR_SANDBOX="0" ## The default target for chutney jobs - - CHUTNEY_MAKE_TARGET="test-network-all" + - CHUTNEY_MAKE="test-network-all" matrix: ## This matrix entry is required, but it doesn't actually create any jobs - @@ -45,7 +45,7 @@ matrix: include: ## We run chutney on macOS, because macOS Travis has IPv6 ## But we only run the IPv6 chutney tests, to speed up the job - - env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" CHUTNEY_MAKE_TARGET="test-network-ipv6" + - env: CHUTNEY_MAKE="test-network-ipv6" CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" os: osx

## We also run basic tests on macOS @@ -112,7 +112,7 @@ matrix:

## Since we're actively developing IPv6, we want to require the IPv6 ## chutney tests - #- env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" CHUTNEY_MAKE_TARGET="test-network-ipv6" + #- env: CHUTNEY_MAKE="test-network-ipv6" CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" # os: osx

## (Linux only) Use a recent Linux image (Ubuntu Bionic) @@ -245,7 +245,7 @@ script: ## We run `make check` because that's what https://jenkins.torproject.org does. - if [[ "$SKIP_MAKE_CHECK" == "" ]]; then make check; fi - if [[ "$DISTCHECK" != "" ]]; then make distcheck DISTCHECK_CONFIGURE_FLAGS="$CONFIGURE_FLAGS"; fi - - if [[ "$CHUTNEY" != "" ]]; then make "$CHUTNEY_MAKE_TARGET"; fi + - if [[ "$CHUTNEY" != "" ]]; then make "$CHUTNEY_MAKE"; fi ## Diagnostic for bug 29437: kill stem if it hangs for 9.5 minutes ## Travis will kill the job after 10 minutes with no output - if [[ "$TEST_STEM" != "" ]]; then make src/app/tor; timelimit -p -t 540 -s USR1 -T 30 -S ABRT python3 "$STEM_SOURCE_DIR"/run_tests.py --tor src/app/tor --integ --test control.controller --test control.base_controller --test process --log TRACE --log-file stem.log; fi