nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-27 22:03:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Travis: Make Chutney output more readable

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

Part of 33280.
This commit is contained in:
teor 2020-02-14 10:38:40 +10:00
parent 334469cc39
commit eaeda21da1
No known key found for this signature in database
GPG Key ID: 10FEAA0E7075672A
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.travis.yml
View File

@ -35,7 +35,7 @@ env:
## triggered by Ubuntu Xenial and Bionic. See #32722. ## triggered by Ubuntu Xenial and Bionic. See #32722.
- CHUTNEY_TOR_SANDBOX="0" - CHUTNEY_TOR_SANDBOX="0"
## The default target for chutney jobs ## The default target for chutney jobs
- CHUTNEY_MAKE_TARGET="test-network-all" - CHUTNEY_MAKE="test-network-all"
matrix: matrix:
## This matrix entry is required, but it doesn't actually create any jobs ## This matrix entry is required, but it doesn't actually create any jobs
- -
@ -45,7 +45,7 @@ matrix:
include: include:
## We run chutney on macOS, because macOS Travis has IPv6 ## We run chutney on macOS, because macOS Travis has IPv6
## But we only run the IPv6 chutney tests, to speed up the job ## 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 os: osx
## We also run basic tests on macOS ## We also run basic tests on macOS
@ -112,7 +112,7 @@ matrix:
## Since we're actively developing IPv6, we want to require the IPv6 ## Since we're actively developing IPv6, we want to require the IPv6
## chutney tests ## 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 # os: osx
## (Linux only) Use a recent Linux image (Ubuntu Bionic) ## (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. ## We run `make check` because that's what https://jenkins.torproject.org does.
- if [[ "$SKIP_MAKE_CHECK" == "" ]]; then make check; fi - if [[ "$SKIP_MAKE_CHECK" == "" ]]; then make check; fi
- if [[ "$DISTCHECK" != "" ]]; then make distcheck DISTCHECK_CONFIGURE_FLAGS="$CONFIGURE_FLAGS"; 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 ## Diagnostic for bug 29437: kill stem if it hangs for 9.5 minutes
## Travis will kill the job after 10 minutes with no output ## 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 - 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