February 2020 - tor-commits - lists.torproject.org

[tor/master] Travis: Require the macOS IPv6 chutney job
by teor＠torproject.org 17 Feb '20

17 Feb '20

commit 03650e0f60ec37c758f90f3e02bf2ace05959a7e Author: teor <teor(a)torproject.org> Date: Thu Feb 13 13:13:40 2020 +1000 Travis: Require the macOS IPv6 chutney job The job was previously set to fast_finish / allow_failure, to speed up the build. Closes ticket 33195. --- .travis.yml | 6 ++++-- changes/ticket33195 | 4 ++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 28a45788b..323ebf5b3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -91,8 +91,10 @@ matrix: - env: RUST_OPTIONS="--enable-rust --enable-cargo-online-mode" compiler: clang os: osx - - env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" - os: osx + ## 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" + # os: osx ## (Linux only) Use a recent Linux image (Ubuntu Bionic) dist: bionic diff --git a/changes/ticket33195 b/changes/ticket33195 new file mode 100644 index 000000000..11abd4816 --- /dev/null +++ b/changes/ticket33195 @@ -0,0 +1,4 @@ + o Testing: + - Stop allowing the Chutney IPv6 Travis job to fail. This job was + previously configured to fast_finish (which requires allow_failure), to + speed up the build. Closes ticket 33195.

1 0

[tor/master] Travis: Remove a redundant distcheck job
by teor＠torproject.org 17 Feb '20

17 Feb '20

commit fc3555100f26201213f4da19d2d2904edc76a229 Author: teor <teor(a)torproject.org> Date: Thu Feb 13 13:22:19 2020 +1000 Travis: Remove a redundant distcheck job Part of 33194. --- .travis.yml | 4 ---- changes/ticket33194 | 2 ++ 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 323ebf5b3..38519db62 100644 --- a/.travis.yml +++ b/.travis.yml @@ -53,16 +53,12 @@ matrix: - env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" compiler: clang ## We check asciidoc with distcheck, to make sure we remove doc products - ## We use Linux clang, because there are no other Linux clang jobs - env: DISTCHECK="yes" ASCIIDOC_OPTIONS="" SKIP_MAKE_CHECK="yes" - compiler: clang ## We include a single coverage build with the best options for coverage - env: COVERAGE_OPTIONS="--enable-coverage" HARDENING_OPTIONS="" ## We run rust on Linux, because it's faster than rust on macOS ## We check rust offline - env: RUST_OPTIONS="--enable-rust" TOR_RUST_DEPENDENCIES=true - ## We check asciidoc with distcheck, to make sure we remove doc products - - env: DISTCHECK="yes" ASCIIDOC_OPTIONS="" SKIP_MAKE_CHECK="yes" ## We check disable module dirauth - env: MODULES_OPTIONS="--disable-module-dirauth" ## macOS builds are very slow, and we have a limited number of diff --git a/changes/ticket33194 b/changes/ticket33194 new file mode 100644 index 000000000..fd9efda51 --- /dev/null +++ b/changes/ticket33194 @@ -0,0 +1,2 @@ + o Testing: + - Remove a redundant distcheck job. Closes ticket 33194.

1 0

[tor/master] Merge branch 'bug33195_043' into bug33195_master
by teor＠torproject.org 17 Feb '20

17 Feb '20

commit c34c101212014f84a8cde3752c198e772f410da7 Merge: e231d84dd 3e8e4af1a Author: teor <teor(a)torproject.org> Date: Thu Feb 13 14:22:18 2020 +1000 Merge branch 'bug33195_043' into bug33195_master .travis.yml | 64 +++++++++++++++++++++++++++++++---------------------- changes/ticket33194 | 4 ++++ changes/ticket33195 | 4 ++++ 3 files changed, 46 insertions(+), 26 deletions(-)

1 0

[tor/master] Travis: Sort jobs in order of speed
by teor＠torproject.org 17 Feb '20

17 Feb '20

commit add387c5071a1ee7889e3789e7b4143bb8856d0a Author: teor <teor(a)torproject.org> Date: Thu Feb 13 13:37:02 2020 +1000 Travis: Sort jobs in order of speed Putting the slowest jobs first takes full advantage of Travis concurrency. Closes 33194. --- .travis.yml | 47 ++++++++++++++++++++++++++++++----------------- changes/ticket33194 | 2 ++ 2 files changed, 32 insertions(+), 17 deletions(-) diff --git a/.travis.yml b/.travis.yml index 38519db62..6047c4470 100644 --- a/.travis.yml +++ b/.travis.yml @@ -39,28 +39,42 @@ env: matrix: ## include creates builds with gcc, linux, unless we override those defaults include: - ## We run basic tests on macOS + ## We run chutney on macOS, because macOS Travis has IPv6 + - env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" + os: osx + + ## We also run basic tests on macOS - compiler: clang os: osx ## Turn off some newer features, turn on clang's -Wtypedef-redefinition env: C_DIALECT_OPTIONS="-std=gnu99" - ## We check NSS - ## Use -std=gnu99 to turn off some newer features, and maybe turn on some - ## extra gcc warnings? - - env: NSS_OPTIONS="--enable-nss" C_DIALECT_OPTIONS="-std=gnu99" + ## We run chutney on Linux, because it's faster than chutney on macOS ## Chutney is a fast job, clang is slower on Linux, so we do Chutney clang - env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" compiler: clang + ## We check asciidoc with distcheck, to make sure we remove doc products - env: DISTCHECK="yes" ASCIIDOC_OPTIONS="" SKIP_MAKE_CHECK="yes" - ## We include a single coverage build with the best options for coverage - - env: COVERAGE_OPTIONS="--enable-coverage" HARDENING_OPTIONS="" + + ## We check disable module dirauth + - env: MODULES_OPTIONS="--disable-module-dirauth" + ## We run rust on Linux, because it's faster than rust on macOS ## We check rust offline - env: RUST_OPTIONS="--enable-rust" TOR_RUST_DEPENDENCIES=true - ## We check disable module dirauth - - env: MODULES_OPTIONS="--disable-module-dirauth" + + ## We check NSS + ## Use -std=gnu99 to turn off some newer features, and maybe turn on some + ## extra gcc warnings? + - env: NSS_OPTIONS="--enable-nss" C_DIALECT_OPTIONS="-std=gnu99" + + ## We include a single coverage build with the best options for coverage + - env: COVERAGE_OPTIONS="--enable-coverage" HARDENING_OPTIONS="" + + ## We clone our stem repo and run `make test-stem` + - env: TEST_STEM="yes" SKIP_MAKE_CHECK="yes" + ## macOS builds are very slow, and we have a limited number of ## concurrent macOS jobs. We're not actively developing Rust, so it is ## the lowest priority. @@ -68,11 +82,6 @@ matrix: #- env: RUST_OPTIONS="--enable-rust --enable-cargo-online-mode" # compiler: clang # os: osx - ## We run chutney on macOS, because macOS Travis has IPv6 - - env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" - os: osx - ## We clone our stem repo and run `make test-stem` - - env: TEST_STEM="yes" SKIP_MAKE_CHECK="yes" ## Allow the build to report success (with non-required sub-builds ## continuing to run) if all required sub-builds have succeeded. @@ -84,9 +93,13 @@ matrix: ## macOS rust and chutney are very slow, so we let the build finish before ## they are done. We'd like to fast finish, but still eventually show ## any failures in the build status. But Travis doesn't have that ability. - - env: RUST_OPTIONS="--enable-rust --enable-cargo-online-mode" - compiler: clang - os: osx + + ## Since this job is disabled, there's not much point having an exception + ## for it + #- env: RUST_OPTIONS="--enable-rust --enable-cargo-online-mode" + # compiler: clang + # os: osx + ## 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" diff --git a/changes/ticket33194 b/changes/ticket33194 index fd9efda51..b87e55348 100644 --- a/changes/ticket33194 +++ b/changes/ticket33194 @@ -1,2 +1,4 @@ o Testing: - Remove a redundant distcheck job. Closes ticket 33194. + - Sort the Travis jobs in order of speed. Putting the slowest jobs first + takes full advantage of Travis job concurrency. Closes ticket 33194.

1 0

[tor/master] Merge branch 'bug33195_041' into bug33195_042
by teor＠torproject.org 17 Feb '20

17 Feb '20

commit f021389e92753e1c6bd76c1525e276e174bd897c Merge: ff5220536 c96cf1494 Author: teor <teor(a)torproject.org> Date: Thu Feb 13 13:58:13 2020 +1000 Merge branch 'bug33195_041' into bug33195_042 Conflicts: * Keep RUST_VERSION from maint-0.4.2 * Keep the commented-out allow_failure entries from bug33195_041 .travis.yml | 57 ++++++++++++++++++++++++++++++++--------------------- changes/ticket33194 | 4 ++++ changes/ticket33195 | 4 ++++ 3 files changed, 42 insertions(+), 23 deletions(-) diff --cc .travis.yml index 26c7b33cd,14b0e12c7..c3903fe1e --- a/.travis.yml +++ b/.travis.yml @@@ -71,14 -79,9 +81,9 @@@ matrix ## concurrent macOS jobs. We're not actively developing Rust, so it is ## the lowest priority. ## We run rust on macOS, because we have seen macOS rust failures before - #- env: RUST_OPTIONS="--enable-rust --enable-cargo-online-mode" + #- env: RUST_VERSION="nightly" RUST_OPTIONS="--enable-rust --enable-cargo-online-mode" # compiler: clang # os: osx - ## We run chutney on macOS, because macOS Travis has IPv6 - - env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" - os: osx - ## We clone our stem repo and run `make test-stem` - - env: TEST_STEM="yes" SKIP_MAKE_CHECK="yes" ## Allow the build to report success (with non-required sub-builds ## continuing to run) if all required sub-builds have succeeded. @@@ -90,11 -93,17 +95,17 @@@ ## macOS rust and chutney are very slow, so we let the build finish before ## they are done. We'd like to fast finish, but still eventually show ## any failures in the build status. But Travis doesn't have that ability. - - env: RUST_VERSION="nightly" RUST_OPTIONS="--enable-rust --enable-cargo-online-mode" - compiler: clang - os: osx - - env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" - os: osx + + ## Since this job is disabled, there's not much point having an exception + ## for it - #- env: RUST_OPTIONS="--enable-rust --enable-cargo-online-mode" ++ #- env: RUST_VERSION="nightly" RUST_OPTIONS="--enable-rust --enable-cargo-online-mode" + # compiler: clang + # os: osx + + ## 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" + # os: osx ## (Linux only) Use a recent Linux image (Ubuntu Bionic) dist: bionic

1 0

[tor/master] Merge branch 'bug33195_035' into bug33195_041
by teor＠torproject.org 17 Feb '20

17 Feb '20

commit c96cf1494357af5a2fd0309ef3d26aba52105edb Merge: 5298113da add387c50 Author: teor <teor(a)torproject.org> Date: Thu Feb 13 13:55:55 2020 +1000 Merge branch 'bug33195_035' into bug33195_041 Conflicts: * Keep TOR_TEST_RNG_SEED from maint-0.4.1 * Keep the ordering from bug33195_035 .travis.yml | 57 ++++++++++++++++++++++++++++++++--------------------- changes/ticket33194 | 4 ++++ changes/ticket33195 | 4 ++++ 3 files changed, 42 insertions(+), 23 deletions(-) diff --cc .travis.yml index 6cfc4e51f,6047c4470..14b0e12c7 --- a/.travis.yml +++ b/.travis.yml @@@ -61,10 -63,18 +63,18 @@@ matrix ## We run rust on Linux, because it's faster than rust on macOS ## We check rust offline - env: RUST_OPTIONS="--enable-rust" TOR_RUST_DEPENDENCIES=true - ## We check asciidoc with distcheck, to make sure we remove doc products - - env: DISTCHECK="yes" ASCIIDOC_OPTIONS="" SKIP_MAKE_CHECK="yes" - ## We check disable module dirauth - - env: MODULES_OPTIONS="--disable-module-dirauth" + + ## We check NSS + ## Use -std=gnu99 to turn off some newer features, and maybe turn on some + ## extra gcc warnings? + - env: NSS_OPTIONS="--enable-nss" C_DIALECT_OPTIONS="-std=gnu99" + + ## We include a single coverage build with the best options for coverage - - env: COVERAGE_OPTIONS="--enable-coverage" HARDENING_OPTIONS="" ++ - env: COVERAGE_OPTIONS="--enable-coverage" HARDENING_OPTIONS="" TOR_TEST_RNG_SEED="636f766572616765" + + ## We clone our stem repo and run `make test-stem` + - env: TEST_STEM="yes" SKIP_MAKE_CHECK="yes" + ## macOS builds are very slow, and we have a limited number of ## concurrent macOS jobs. We're not actively developing Rust, so it is ## the lowest priority.

1 0

[tor/master] Merge branch 'bug33195_042' into bug33195_043
by teor＠torproject.org 17 Feb '20

17 Feb '20

commit 3e8e4af1ac09486789f4e094a9bc527cfd41a35d Merge: d0c335021 f021389e9 Author: teor <teor(a)torproject.org> Date: Thu Feb 13 14:01:54 2020 +1000 Merge branch 'bug33195_042' into bug33195_043 Conflicts: * Keep disable module relay from maint-0.4.3 * Keep doxygen from maint-0.4.3 * Keep the ordering from bug33195_042 .travis.yml | 64 +++++++++++++++++++++++++++++++---------------------- changes/ticket33194 | 4 ++++ changes/ticket33195 | 4 ++++ 3 files changed, 46 insertions(+), 26 deletions(-) diff --cc .travis.yml index af5052682,c3903fe1e..d8218c7c0 --- a/.travis.yml +++ b/.travis.yml @@@ -54,21 -55,28 +55,33 @@@ matrix ## Chutney is a fast job, clang is slower on Linux, so we do Chutney clang - env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" compiler: clang - ## We check asciidoc with distcheck, to make sure we remove doc products - ## We use Linux clang, because there are no other Linux clang jobs - - env: DISTCHECK="yes" ASCIIDOC_OPTIONS="" SKIP_MAKE_CHECK="yes" - compiler: clang - ## We include a single coverage build with the best options for coverage - - env: COVERAGE_OPTIONS="--enable-coverage" HARDENING_OPTIONS="" TOR_TEST_RNG_SEED="636f766572616765" - ## We run rust on Linux, because it's faster than rust on macOS - ## We check rust offline - - env: RUST_OPTIONS="--enable-rust" TOR_RUST_DEPENDENCIES=true + ## We check asciidoc with distcheck, to make sure we remove doc products - env: DISTCHECK="yes" ASCIIDOC_OPTIONS="" SKIP_MAKE_CHECK="yes" + + ## We check disable module relay + - env: MODULES_OPTIONS="--disable-module-relay" ## We check disable module dirauth - env: MODULES_OPTIONS="--disable-module-dirauth" + + ## We run rust on Linux, because it's faster than rust on macOS + ## We check rust offline + - env: RUST_OPTIONS="--enable-rust" TOR_RUST_DEPENDENCIES=true + + ## We check NSS + ## Use -std=gnu99 to turn off some newer features, and maybe turn on some + ## extra gcc warnings? + - env: NSS_OPTIONS="--enable-nss" C_DIALECT_OPTIONS="-std=gnu99" + + ## We include a single coverage build with the best options for coverage + - env: COVERAGE_OPTIONS="--enable-coverage" HARDENING_OPTIONS="" TOR_TEST_RNG_SEED="636f766572616765" + + ## We clone our stem repo and run `make test-stem` + - env: TEST_STEM="yes" SKIP_MAKE_CHECK="yes" + ++ ## We run `make doxygen` without `make check`. ++ - env: SKIP_MAKE_CHECK="yes" DOXYGEN="yes" ++ ## macOS builds are very slow, and we have a limited number of ## concurrent macOS jobs. We're not actively developing Rust, so it is ## the lowest priority.

1 0

[tor/master] Merge branch 'bug33195_master' into ticket33280_master
by teor＠torproject.org 17 Feb '20

17 Feb '20

commit 334469cc39f329701fa48fb752d35a2cee7edc69 Merge: 25ecdf140 c34c10121 Author: teor <teor(a)torproject.org> Date: Mon Feb 17 13:46:09 2020 +1000 Merge branch 'bug33195_master' into ticket33280_master Conflicts: * Keep the changes from ticket33280_master changes/ticket33188 | 5 + doc/tor.1.txt | 630 ++++++++++++++++++----------------- src/feature/dirauth/process_descs.h | 6 +- src/feature/dircache/dirserv.h | 4 +- src/feature/nodelist/networkstatus.c | 2 +- src/lib/cc/compat_compiler.h | 2 +- src/test/test_util.c | 4 +- 7 files changed, 335 insertions(+), 318 deletions(-)

1 0

[tor/master] Travis: Make Chutney output more readable
by teor＠torproject.org 17 Feb '20

17 Feb '20

commit eaeda21da168e04b70659a0e17077114dd419ba6 Author: teor <teor(a)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

1 0

[tor/master] Makefile: Quote test-network variable expansions
by teor＠torproject.org 17 Feb '20

17 Feb '20

commit 225613fcc22958706e55e55ce1295eca3e28971e Author: teor <teor(a)torproject.org> Date: Fri Feb 14 10:34:17 2020 +1000 Makefile: Quote test-network variable expansions Also: * wrap some long lines * replace an instance of "test ... -a ..." with "test ... && test ..." Part of 33280. --- Makefile.am | 73 ++++++++++++++++++++++++++++++++++++++++--------------------- 1 file changed, 48 insertions(+), 25 deletions(-) diff --git a/Makefile.am b/Makefile.am index 72ea34380..d43b4b0a0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -281,8 +281,10 @@ check-local: \ need-chutney-path: @if test ! -d "$$CHUTNEY_PATH"; then \ echo '$$CHUTNEY_PATH was not set.'; \ - if test -d $(top_srcdir)/../chutney -a -x $(top_srcdir)/../chutney/chutney; then \ - echo "Assuming test-network.sh will find" $(top_srcdir)/../chutney; \ + if test -d "$(top_srcdir)/../chutney" && \ + test -x "$(top_srcdir)/../chutney/chutney"; then \ + echo "Assuming test-network.sh will find" \ + "$(top_srcdir)/../chutney"; \ else \ echo; \ echo "To run these tests, git clone https://git.torproject.org/chutney.git ; export CHUTNEY_PATH=\`pwd\`/chutney"; \ @@ -295,8 +297,10 @@ need-chutney-path: test-network: @$(MAKE) test-network-mkdir @$(MAKE) test-network-clean - @$(MAKE) test-network-ipv4-impl ipv4_flavors="$(TEST_CHUTNEY_FLAVOR_QUICK)" - @$(MAKE) test-network-ipv6-impl ipv6_flavors="$(TEST_CHUTNEY_FLAVOR_QUICK_IPV6)" + @$(MAKE) test-network-ipv4-impl \ + ipv4_flavors="$(TEST_CHUTNEY_FLAVOR_QUICK)" + @$(MAKE) test-network-ipv6-impl \ + ipv6_flavors="$(TEST_CHUTNEY_FLAVOR_QUICK_IPV6)" @$(MAKE) test-network-results # Run all available tests using automake's test-driver @@ -304,9 +308,12 @@ test-network: test-network-all: @$(MAKE) test-network-mkdir @$(MAKE) test-network-clean - @$(MAKE) test-network-ipv4-impl ipv4_flavors="$(TEST_CHUTNEY_FLAVORS)" - @$(MAKE) test-network-mixed-impl mixed_flavors="$(TEST_CHUTNEY_FLAVORS_MIXED)" - @$(MAKE) test-network-ipv6-impl ipv6_flavors="$(TEST_CHUTNEY_FLAVORS_IPV6)" + @$(MAKE) test-network-ipv4-impl \ + ipv4_flavors="$(TEST_CHUTNEY_FLAVORS)" + @$(MAKE) test-network-mixed-impl \ + mixed_flavors="$(TEST_CHUTNEY_FLAVORS_MIXED)" + @$(MAKE) test-network-ipv6-impl \ + ipv6_flavors="$(TEST_CHUTNEY_FLAVORS_IPV6)" @$(MAKE) test-network-results # Run IPv4 and mixed tests using automake's test-driver @@ -315,7 +322,8 @@ test-network-ipv4: @$(MAKE) test-network-mkdir @$(MAKE) test-network-clean @$(MAKE) test-network-ipv4-impl ipv4_flavors="$(TEST_CHUTNEY_FLAVORS)" - @$(MAKE) test-network-mixed-impl mixed_flavors="$(TEST_CHUTNEY_FLAVORS_MIXED)" + @$(MAKE) test-network-mixed-impl \ + mixed_flavors="$(TEST_CHUTNEY_FLAVORS_MIXED)" @$(MAKE) test-network-results # Run IPv6 tests using automake's test-driver @@ -323,18 +331,22 @@ test-network-ipv4: test-network-ipv6: @$(MAKE) test-network-mkdir @$(MAKE) test-network-clean - @$(MAKE) test-network-ipv6-impl ipv6_flavors="$(TEST_CHUTNEY_FLAVORS_IPV6)" + @$(MAKE) test-network-ipv6-impl \ + ipv6_flavors="$(TEST_CHUTNEY_FLAVORS_IPV6)" @$(MAKE) test-network-results # Make the test network log directory, if it does not exist .PHONY: test-network-mkdir test-network-mkdir: - @mkdir -p $(TEST_NETWORK_ALL_LOG_DIR) + @mkdir -p "$(TEST_NETWORK_ALL_LOG_DIR)" # Clean the test network log directory .PHONY: test-network-clean +# We need to remove all matching files, so we can't quote the glob part of the +# rm arguments test-network-clean: - rm -f $(TEST_NETWORK_ALL_LOG_DIR)/*.log $(TEST_NETWORK_ALL_LOG_DIR)/*.trs + rm -f "$(TEST_NETWORK_ALL_LOG_DIR)"/*.log \ + "$(TEST_NETWORK_ALL_LOG_DIR)"/*.trs # Run the IPv4-only test flavors # - $(ipv4_flavors) contains the tests to run @@ -349,13 +361,16 @@ test-network-ipv4-impl: test-network-mixed-impl: @flavors=""; \ if command -v tor-stable >/dev/null 2>&1; then \ - echo "tor-stable found, running mixed flavors: $(mixed_flavors)."; \ + echo "tor-stable found, running mixed flavors:" \ + "$(mixed_flavors)."; \ flavors="$$flavors $(mixed_flavors)"; \ else \ - echo "tor-stable not found, skipping mixed flavors: $(mixed_flavors)."; \ + echo "tor-stable not found, skipping mixed flavors:" \ + "$(mixed_flavors)."; \ skip_flavors="$$skip_flavors $(mixed_flavors)"; \ fi; \ - $(MAKE) test-network-run flavors="$$flavors" skip_flavors="$$skip_flavors" + $(MAKE) test-network-run flavors="$$flavors" \ + skip_flavors="$$skip_flavors" # Run the IPv6 tests in $(ipv6_flavors), if IPv6 is available # - only run IPv6 tests if we can ping6 or ping -6 ::1 (localhost) @@ -370,30 +385,35 @@ test-network-ipv6-impl: if ping6 -q -c 1 -o ::1 >/dev/null 2>&1 || \ ping6 -q -c 1 -W 1 ::1 >/dev/null 2>&1 || \ ping -6 -c 1 -W 1 ::1 >/dev/null 2>&1; then \ - echo "ping6 ::1 or ping ::1 succeeded, running IPv6 flavors: $(ipv6_flavors)."; \ + echo "ping6 ::1 or ping ::1 succeeded, running IPv6" \ + "flavors: $(ipv6_flavors)."; \ flavors="$$flavors $(ipv6_flavors)"; \ else \ - echo "ping6 ::1 and ping ::1 failed, skipping IPv6 flavors: $(ipv6_flavors)."; \ + echo "ping6 ::1 and ping ::1 failed, skipping IPv6 flavors:" \ + "$(ipv6_flavors)."; \ skip_flavors="$$skip_flavors $(ipv6_flavors)"; \ fi; \ - $(MAKE) test-network-run flavors="$$flavors" skip_flavors="$$skip_flavors" + $(MAKE) test-network-run flavors="$$flavors" \ + skip_flavors="$$skip_flavors" # Run tests using automake's test-driver # - $(flavors) contains the tests to run # - $(skip_flavors) contains the tests to skip .PHONY: test-network-run +# We need the word splitting in the "for" lines, so we can't quote +# $(skip_flavors) or $(flavors) test-network-run: need-chutney-path test-driver $(TESTING_TOR_BINARY) src/tools/tor-gencert @for f in $(skip_flavors); do \ echo "SKIP: $$f"; \ done; \ for f in $(flavors); do \ - $(SHELL) $(top_srcdir)/test-driver --test-name $$f \ - --log-file $(TEST_NETWORK_ALL_LOG_DIR)/$$f.log \ - --trs-file $(TEST_NETWORK_ALL_LOG_DIR)/$$f.trs \ + $(SHELL) "$(top_srcdir)/test-driver" --test-name "$$f" \ + --log-file "$(TEST_NETWORK_ALL_LOG_DIR)/$$f.log" \ + --trs-file "$(TEST_NETWORK_ALL_LOG_DIR)/$$f.trs" \ $(TEST_NETWORK_ALL_DRIVER_FLAGS) \ - $(top_srcdir)/src/test/test-network.sh \ - --flavor $$f $(TEST_NETWORK_FLAGS); \ - $(top_srcdir)/src/test/test-network.sh \ + "$(top_srcdir)/src/test/test-network.sh" \ + --flavor "$$f" $(TEST_NETWORK_FLAGS); \ + "$(top_srcdir)/src/test/test-network.sh" \ $(TEST_NETWORK_SHOW_WARNINGS_FOR_LAST_RUN_FLAGS); \ done @@ -402,9 +422,12 @@ test-network-run: need-chutney-path test-driver $(TESTING_TOR_BINARY) src/tools/ # (otherwise, warnings go to the logs, and people don't see them unless # there is a network failure) .PHONY: test-network-results +# We need to grep all matching files, so we can't quote the glob part of the +# grep arguments test-network-results: - @echo "Log and result files are available in $(TEST_NETWORK_ALL_LOG_DIR)." - @! grep -q FAIL $(TEST_NETWORK_ALL_LOG_DIR)/*.trs + @echo \ + "Log and result files are available in $(TEST_NETWORK_ALL_LOG_DIR)." + @! grep -q FAIL "$(TEST_NETWORK_ALL_LOG_DIR)"/*.trs need-stem-path: @if test ! -d "$$STEM_SOURCE_DIR"; then \

1 0