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

[translation/torbirdy] https://gitweb.torproject.org/translation.git/commit/?h=torbirdy
by translation＠torproject.org 17 Feb '20

17 Feb '20

commit 41f86a7f67debfd0bbf1b2d756757f76649ccdb5 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Feb 17 05:20:49 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=torbirdy --- vi/torbirdy.properties | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/vi/torbirdy.properties b/vi/torbirdy.properties index 5315699d2f..5946f354d8 100644 --- a/vi/torbirdy.properties +++ b/vi/torbirdy.properties @@ -1,14 +1,14 @@ torbirdy.name=TorBirdy torbirdy.enabled.tor=TorBirdy đã kích hoạt: Tor -torbirdy.enabled.jondo=TorBirdy được kích hoạt: JonDo -torbirdy.enabled.custom=TorBirdy đã kích hoạt: Ủy quyền tùy chỉnh -torbirdy.enabled.torification=TorBirdy được kích hoạt: Transparent Torification +torbirdy.enabled.jondo=TorBirdy đã kích hoạt: JonDo +torbirdy.enabled.custom=TorBirdy đã kích hoạt: Proxy tùy chỉnh +torbirdy.enabled.torification=TorBirdy được kích hoạt: Tor-hóa vô hình torbirdy.enabled.whonix=TorBirdy đã kích hoạt: Whonix -torbirdy.disabled=TorBirdy: Đã bị vô hiệu hoá. +torbirdy.disabled=TorBirdy: Đã vô hiệu hoá! torbirdy.enabled=TorBirdy: Đã kích hoạt -torbirdy.email.prompt=TorBirdy đã vô hiệu hoá thuật sĩ tự động cấu hình của ThunderBird để bảo vệ sự ẩn danh của bạn.\nBạn có thể cài đặt cấu hình các tài khoản bằng thủ công. +torbirdy.email.prompt=TorBirdy đã vô hiệu hoá trình cài đặt tự động của ThunderBird để bảo vệ sự ẩn danh của bạn.\n\nCài đặt bảo mật khuyến nghĩ cho %S đã được đặt.\n\nBạn có thể cài đặt cấu hình các tài khoản khác một cách thủ công. torbirdy.email.advanced=Vui lòng chú ý việc thay đổi các cài đặt nâng cao của TorBirdy là không được khuyến khích.\nBạn chỉ nên tiếp tục nếu như bạn biết chắc rằng mình đang làm gì. torbirdy.email.advanced.nextwarning=HIển thị cảnh báo này trong thời gian tới.

1 0

[chutney/master] networks: Add mixed+hs-v23-ipv6
by teor＠torproject.org 17 Feb '20

17 Feb '20

commit 5adf2bfb0b9bc98dcca761b4c37531bbe56786e0 Author: teor <teor(a)torproject.org> Date: Mon Feb 17 13:18:24 2020 +1000 networks: Add mixed+hs-v23-ipv6 Add a mixed-version network that runs onion services and IPv6. Closes ticket 33333. --- networks/mixed+hs-v23-ipv6 | 61 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/networks/mixed+hs-v23-ipv6 b/networks/mixed+hs-v23-ipv6 new file mode 100644 index 0000000..250bde1 --- /dev/null +++ b/networks/mixed+hs-v23-ipv6 @@ -0,0 +1,61 @@ +# This network uses microdescriptors, even though it doesn't end in -md +# All current tor versions support microdescriptors for IPv6 + +Require("IPV6") + +import os + +OLD_TOR="tor-stable" + +# By default, Authorities are not configured as exits +Authority6 = Node(tag="a", authority=1, relay=1, + ipv6_addr=os.environ.get('CHUTNEY_LISTEN_ADDRESS_V6', + '[::1]'), + torrc="authority-orport-v6.tmpl") +OldAuthority6 = Node(tag="aOLD", authority=1, relay=1, + ipv6_addr=os.environ.get('CHUTNEY_LISTEN_ADDRESS_V6', + '[::1]'), + torrc="authority-orport-v6.tmpl", + tor=OLD_TOR) + +NonExitRelay = Node(tag="r", relay=1, + torrc="relay-non-exit.tmpl") +OldNonExitRelay = Node(tag="rOLD", relay=1, + torrc="relay-non-exit.tmpl", + tor=OLD_TOR) +NonExitRelay6 = Node(tag="r", relay=1, + ipv6_addr=os.environ.get('CHUTNEY_LISTEN_ADDRESS_V6', + '[::1]'), + torrc="relay-orport-v6-non-exit.tmpl") +OldNonExitRelay6 = Node(tag="rOLD", relay=1, + ipv6_addr=os.environ.get('CHUTNEY_LISTEN_ADDRESS_V6', + '[::1]'), + torrc="relay-orport-v6-non-exit.tmpl", + tor=OLD_TOR) + +Client6 = Node(tag="c", client=1, + torrc="client-only-v6-md.tmpl") +OldClient6 = Node(tag="cOLD", client=1, + torrc="client-only-v6-md.tmpl", + tor=OLD_TOR) + +HSv2IPv6 = Node(tag="h", hs=1, + torrc="hs-only-v6-md.tmpl") +OldHSv2IPv6 = Node(tag="hOLD", hs=1, + torrc="hs-only-v6-md.tmpl", + tor=OLD_TOR) + +HSv3IPv6 = Node(tag="h", hs=1, + torrc="hs-v3-only-v6-md.tmpl") +OldHSv3IPv6 = Node(tag="hOLD", hs=1, + torrc="hs-v3-only-v6-md.tmpl", + tor=OLD_TOR) + +NODES = Authority6.getN(1) + OldAuthority6.getN(1) + \ + NonExitRelay.getN(1) + OldNonExitRelay.getN(1) + \ + NonExitRelay6.getN(1) + OldNonExitRelay6.getN(1) + \ + Client6.getN(1) + OldClient6.getN(1) + \ + HSv2IPv6.getN(1) + OldHSv2IPv6.getN(1) + \ + HSv3IPv6.getN(1) + OldHSv3IPv6.getN(1) + +ConfigureNodes(NODES)

1 0

[chutney/master] networks: Make hs-v23-ipv6-md more readable
by teor＠torproject.org 17 Feb '20

17 Feb '20

commit 0f39f6c73b085f636889ba1b66a31a74976fa576 Author: teor <teor(a)torproject.org> Date: Mon Feb 17 13:19:05 2020 +1000 networks: Make hs-v23-ipv6-md more readable Whitespace-only changes. --- networks/hs-v23-ipv6-md | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/networks/hs-v23-ipv6-md b/networks/hs-v23-ipv6-md index fb7161b..ffe1b5b 100644 --- a/networks/hs-v23-ipv6-md +++ b/networks/hs-v23-ipv6-md @@ -1,16 +1,21 @@ Require("IPV6") + import os + # By default, Authorities are not configured as exits Authority6 = Node(tag="a", authority=1, relay=1, ipv6_addr=os.environ.get('CHUTNEY_LISTEN_ADDRESS_V6', '[::1]'), torrc="authority-orport-v6.tmpl") + NonExitRelay6 = Node(tag="r", relay=1, ipv6_addr=os.environ.get('CHUTNEY_LISTEN_ADDRESS_V6', '[::1]'), torrc="relay-orport-v6-non-exit.tmpl") + Client = Node(tag="c", client=1, torrc="client.tmpl") Client6 = Node(tag="c", client=1, torrc="client-only-v6-md.tmpl") + HSv2IPv6 = Node(tag="h", hs=1, torrc="hs-only-v6-md.tmpl") HSv3IPv6 = Node(tag="h", hs=1, torrc="hs-v3-only-v6-md.tmpl") @@ -21,7 +26,9 @@ HSv3IPv6 = Node(tag="h", hs=1, torrc="hs-v3-only-v6-md.tmpl") # connections: # a minimum path length of 3, plus the client-nominated rendezvous point, # plus a seperate introduction point -NODES = Authority6.getN(2) + NonExitRelay6.getN(3) + \ - Client.getN(1) + Client6.getN(1) + HSv2IPv6.getN(1) + HSv3IPv6.getN(1) +NODES = Authority6.getN(2) + \ + NonExitRelay6.getN(3) + \ + Client.getN(1) + Client6.getN(1) + \ + HSv2IPv6.getN(1) + HSv3IPv6.getN(1) ConfigureNodes(NODES)

1 0

[tor/master] Makefike: Add an IPv6 test to test-network
by teor＠torproject.org 17 Feb '20

17 Feb '20

commit 9d352028e60fa5b2b239f6ce0803c2b1b0cb5d84 Author: teor <teor(a)torproject.org> Date: Thu Feb 13 11:57:36 2020 +1000 Makefike: Add an IPv6 test to test-network The IPv6 test only runs if IPv6 is available. Also, explicitly use the bridges+hs-v2 network for the IPv4-only test. This network was chutney's default as of January 2020. Closes 33300. --- Makefile.am | 15 +++++++++++---- changes/ticket33300 | 3 +++ src/test/include.am | 10 ++++++++++ 3 files changed, 24 insertions(+), 4 deletions(-) diff --git a/Makefile.am b/Makefile.am index 3f93e9f5c..72ea34380 100644 --- a/Makefile.am +++ b/Makefile.am @@ -275,6 +275,9 @@ check-local: \ shellcheck \ check-cocci +# test-network requires a copy of Chutney in $CHUTNEY_PATH. +# Chutney can be cloned from https://git.torproject.org/chutney.git . +.PHONY: need-chutney-path need-chutney-path: @if test ! -d "$$CHUTNEY_PATH"; then \ echo '$$CHUTNEY_PATH was not set.'; \ @@ -287,10 +290,14 @@ need-chutney-path: fi \ fi -# Note that test-network requires a copy of Chutney in $CHUTNEY_PATH. -# Chutney can be cloned from https://git.torproject.org/chutney.git . -test-network: need-chutney-path $(TESTING_TOR_BINARY) src/tools/tor-gencert - $(top_srcdir)/src/test/test-network.sh $(TEST_NETWORK_FLAGS) +# Run some basic tests using automake's test-driver +.PHONY: test-network +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-results # Run all available tests using automake's test-driver .PHONY: test-network-all diff --git a/changes/ticket33300 b/changes/ticket33300 new file mode 100644 index 000000000..9b0bdce37 --- /dev/null +++ b/changes/ticket33300 @@ -0,0 +1,3 @@ + o Testing: + - Add a basic IPv6 test to "make test-network". This test only runs when + the local machine has an IPv6 stack. Closes ticket 33300. diff --git a/src/test/include.am b/src/test/include.am index 90e50752c..47e8d8fb0 100644 --- a/src/test/include.am +++ b/src/test/include.am @@ -61,11 +61,21 @@ TESTS += src/test/test src/test/test-slow src/test/test-memwipe \ $(TESTSCRIPTS) # These flavors are run using automake's test-driver and test-network.sh + +# run a quick test or two +# this test only uses IPv4 +TEST_CHUTNEY_FLAVOR_QUICK = bridges+hs-v2 +# only run if we can ping6 ::1 (localhost) +TEST_CHUTNEY_FLAVOR_QUICK_IPV6 = client-ipv6-only-md + +# run a basic set of tests, which only use IPv4 TEST_CHUTNEY_FLAVORS = basic-min bridges-min hs-v2-min hs-v3-min \ single-onion-v23 + # only run if we can ping6 ::1 (localhost) TEST_CHUTNEY_FLAVORS_IPV6 = bridges+ipv6-min ipv6-exit-min hs-v23-ipv6-md \ single-onion-v23-ipv6-md + # only run if we can find a stable (or simply another) version of tor TEST_CHUTNEY_FLAVORS_MIXED = mixed+hs-v2

1 0

[tor/master] Travis: Only run IPv6 chutney tests on macOS
by teor＠torproject.org 17 Feb '20

17 Feb '20

commit c847b9f1a6fc09d19ab28b62f5b1389469d6fa0d Author: teor <teor(a)torproject.org> Date: Thu Feb 13 13:06:17 2020 +1000 Travis: Only run IPv6 chutney tests on macOS Run the test-network-ipv6 Makefile target in the Travis CI IPv6 chutney job. This job runs on macOS, so it's a bit slow. Closes ticket 33303. --- .travis.yml | 9 ++++++--- changes/ticket33303 | 4 ++++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index af5052682..73caaa79a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,6 +34,8 @@ env: ## Turn off tor's sandbox in chutney, until we fix sandbox errors that are ## triggered by Ubuntu Xenial and Bionic. See #32722. - CHUTNEY_TOR_SANDBOX="0" + ## The default target for chutney jobs + - CHUTNEY_MAKE_TARGET="test-network-all" matrix: ## This matrix entry is required, but it doesn't actually create any jobs - @@ -77,7 +79,8 @@ matrix: # 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" + ## 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" os: osx ## We clone our stem repo and run `make test-stem` - env: TEST_STEM="yes" SKIP_MAKE_CHECK="yes" @@ -97,7 +100,7 @@ matrix: - 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" + - env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" CHUTNEY_MAKE_TARGET="test-network-ipv6" os: osx ## (Linux only) Use a recent Linux image (Ubuntu Bionic) @@ -230,7 +233,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 test-network-all; fi + - if [[ "$CHUTNEY" != "" ]]; then make "$CHUTNEY_MAKE_TARGET"; 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 diff --git a/changes/ticket33303 b/changes/ticket33303 new file mode 100644 index 000000000..b7ac7b506 --- /dev/null +++ b/changes/ticket33303 @@ -0,0 +1,4 @@ + o Testing: + - Run the test-network-ipv6 Makefile target in the Travis CI IPv6 chutney + job. This job runs on macOS, so it's a bit slow. + Closes ticket 33303.

1 0

[tor/master] Makefile: Split test-network-all into IPv4 and IPv6
by teor＠torproject.org 17 Feb '20

17 Feb '20

commit c33ffe013bd84d6246a2a9e59ccb82a599b89030 Author: teor <teor(a)torproject.org> Date: Thu Feb 13 10:09:33 2020 +1000 Makefile: Split test-network-all into IPv4 and IPv6 Add test-network-ipv4 and test-network-ipv6 tests to the Makefile. These tests run the IPv4-only and dual-stack chutney flavours from test-network-all. Closes ticket 33280. --- Makefile.am | 123 ++++++++++++++++++++++++++++++++++++++++------------ changes/ticket33280 | 4 ++ 2 files changed, 100 insertions(+), 27 deletions(-) diff --git a/Makefile.am b/Makefile.am index ac61a990f..3f93e9f5c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -293,42 +293,111 @@ test-network: need-chutney-path $(TESTING_TOR_BINARY) src/tools/tor-gencert $(top_srcdir)/src/test/test-network.sh $(TEST_NETWORK_FLAGS) # Run all available tests using automake's test-driver +.PHONY: test-network-all +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-results + +# Run IPv4 and mixed tests using automake's test-driver +.PHONY: test-network-ipv4 +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-results + +# Run IPv6 tests using automake's test-driver +.PHONY: test-network-ipv6 +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-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) + +# Clean the test network log directory +.PHONY: test-network-clean +test-network-clean: + 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 +.PHONY: test-network-ipv4-impl +test-network-ipv4-impl: + @$(MAKE) test-network-run flavors="$(ipv4_flavors)" skip_flavors="" + +# Run the mixed tests in $(mixed_flavors), if a tor-stable binary is available +# - only run mixed tests if we have a tor-stable binary +# - $(mixed_flavors) contains the tests to run (or skip) +.PHONY: test-network-mixed-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)."; \ + flavors="$$flavors $(mixed_flavors)"; \ + else \ + 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" + +# Run the IPv6 tests in $(ipv6_flavors), if IPv6 is available # - only run IPv6 tests if we can ping6 or ping -6 ::1 (localhost) # we try the syntax for BSD ping6, Linux ping6, and Linux ping -6, # because they're incompatible # - some IPv6 tests may fail without an IPv6 DNS server # (see #16971 and #17011) -# - only run mixed tests if we have a tor-stable binary -# - show tor warnings on the console after each network run -# (otherwise, warnings go to the logs, and people don't see them unless -# there is a network failure) -test-network-all: need-chutney-path test-driver $(TESTING_TOR_BINARY) src/tools/tor-gencert - mkdir -p $(TEST_NETWORK_ALL_LOG_DIR) - rm -f $(TEST_NETWORK_ALL_LOG_DIR)/*.log $(TEST_NETWORK_ALL_LOG_DIR)/*.trs - @flavors="$(TEST_CHUTNEY_FLAVORS)"; \ - 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: $(TEST_CHUTNEY_FLAVORS_IPV6)."; \ - flavors="$$flavors $(TEST_CHUTNEY_FLAVORS_IPV6)"; \ - else \ - echo "ping6 ::1 and ping ::1 failed, skipping IPv6 flavors: $(TEST_CHUTNEY_FLAVORS_IPV6)."; \ - skip_flavors="$$skip_flavors $(TEST_CHUTNEY_FLAVORS_IPV6)"; \ - fi; \ - if command -v tor-stable >/dev/null 2>&1; then \ - echo "tor-stable found, running mixed flavors: $(TEST_CHUTNEY_FLAVORS_MIXED)."; \ - flavors="$$flavors $(TEST_CHUTNEY_FLAVORS_MIXED)"; \ +# - $(ipv6_flavors) contains the tests to run (or skip) +.PHONY: test-network-ipv6-impl +test-network-ipv6-impl: + @flavors=""; \ + 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)."; \ + flavors="$$flavors $(ipv6_flavors)"; \ else \ - echo "tor-stable not found, skipping mixed flavors: $(TEST_CHUTNEY_FLAVORS_MIXED)."; \ - skip_flavors="$$skip_flavors $(TEST_CHUTNEY_FLAVORS_MIXED)"; \ + echo "ping6 ::1 and ping ::1 failed, skipping IPv6 flavors: $(ipv6_flavors)."; \ + skip_flavors="$$skip_flavors $(ipv6_flavors)"; \ fi; \ - for f in $$skip_flavors; do \ + $(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 +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 $(TEST_NETWORK_ALL_DRIVER_FLAGS) $(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; \ - echo "Log and result files are available in $(TEST_NETWORK_ALL_LOG_DIR)."; \ - ! grep -q FAIL $(TEST_NETWORK_ALL_LOG_DIR)/*.trs + 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 \ + $(TEST_NETWORK_ALL_DRIVER_FLAGS) \ + $(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 + +# Print the results from automake's test-driver +# - show tor warnings on the console after each network run +# (otherwise, warnings go to the logs, and people don't see them unless +# there is a network failure) +.PHONY: test-network-results +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 need-stem-path: @if test ! -d "$$STEM_SOURCE_DIR"; then \ diff --git a/changes/ticket33280 b/changes/ticket33280 new file mode 100644 index 000000000..b90c3086e --- /dev/null +++ b/changes/ticket33280 @@ -0,0 +1,4 @@ + o Testing: + - Add test-network-ipv4 and test-network-ipv6 jobs to the Makefile. + These jobs run the IPv4-only and dual-stack chutney flavours from + test-network-all. Closes ticket 33280.

1 0

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

17 Feb '20

commit 82bacca4e0c47baa34a6cbb49ed9d1c96999e749 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 73caaa79a..911a5f6ab 100644 --- a/.travis.yml +++ b/.travis.yml @@ -100,8 +100,10 @@ matrix: - 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" CHUTNEY_MAKE_TARGET="test-network-ipv6" - 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" CHUTNEY_MAKE_TARGET="test-network-ipv6" + # 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] Makefile: Use chutney's latest default network
by teor＠torproject.org 17 Feb '20

17 Feb '20

commit 02f494360a71959c8f81a6015a42965d95b2818c Author: teor <teor(a)torproject.org> Date: Thu Feb 13 12:33:42 2020 +1000 Makefile: Use chutney's latest default network Use bridges+hs-v23 for "make test-network", rather than using chutney's old default. This change requires a recent version of chutney, because the old bridges+hs-v23 did not work. (See chutney's 33302 for details.) Closes 28208. --- changes/ticket28208 | 4 ++++ src/test/include.am | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/changes/ticket28208 b/changes/ticket28208 new file mode 100644 index 000000000..8818aad1d --- /dev/null +++ b/changes/ticket28208 @@ -0,0 +1,4 @@ + o Testing: + - Use the "bridges+hs-v23" chutney network flavor in "make test-network". + This test requires a recent version of chutney (mid-February 2020). + Closes ticket 28208. diff --git a/src/test/include.am b/src/test/include.am index 47e8d8fb0..fdd1195fd 100644 --- a/src/test/include.am +++ b/src/test/include.am @@ -64,7 +64,7 @@ TESTS += src/test/test src/test/test-slow src/test/test-memwipe \ # run a quick test or two # this test only uses IPv4 -TEST_CHUTNEY_FLAVOR_QUICK = bridges+hs-v2 +TEST_CHUTNEY_FLAVOR_QUICK = bridges+hs-v23 # only run if we can ping6 ::1 (localhost) TEST_CHUTNEY_FLAVOR_QUICK_IPV6 = client-ipv6-only-md

1 0

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

17 Feb '20

commit 9ba147e9af37ce3697bc1352595da94dcf0262f4 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 911a5f6ab..29533dab0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -57,16 +57,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="" 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 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] Travis: Sort jobs in order of speed
by teor＠torproject.org 17 Feb '20

17 Feb '20

commit 25ecdf1409c9d1d33e546cff1e617e14d84fae03 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 | 56 +++++++++++++++++++++++++++++++++-------------------- changes/ticket33194 | 2 ++ 2 files changed, 37 insertions(+), 21 deletions(-) diff --git a/.travis.yml b/.travis.yml index 29533dab0..e8533c08a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -43,30 +43,48 @@ 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 + ## 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" + 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="" 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 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. @@ -74,14 +92,6 @@ matrix: #- 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 - ## 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" - os: osx - ## 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" ## Allow the build to report success (with non-required sub-builds ## continuing to run) if all required sub-builds have succeeded. @@ -93,9 +103,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_VERSION="nightly" 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_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" CHUTNEY_MAKE_TARGET="test-network-ipv6" 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