August 2018 - tor-commits - lists.torproject.org

[tor/maint-0.3.4] Merge branch 'maint-0.3.3' into maint-0.3.4
by nickm＠torproject.org 29 Aug '18

29 Aug '18

commit 0ea622aa3a678f19759a42e9521a259ef4bcf5a4 Merge: 0483f7f64 a28c14aad Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 29 11:17:31 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 Makefile.am | 3 ++- changes/bug27295 | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-)

1 0

[tor/master] Merge branch 'maint-0.2.9' into maint-0.3.2
by nickm＠torproject.org 29 Aug '18

29 Aug '18

commit b40f9967fa31faa1dcf1a977989e235fbe836015 Merge: 70a07fa90 541b89b06 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 29 11:17:31 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.2 Makefile.am | 3 ++- changes/bug27295 | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --cc Makefile.am index 4d2d9d222,e4be3f26f..34493765d --- a/Makefile.am +++ b/Makefile.am @@@ -143,10 -127,9 +144,10 @@@ test-network-all: need-chutney-path tes 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_WARNING_FLAGS); \ done; \ echo "Log and result files are available in $(TEST_NETWORK_ALL_LOG_DIR)."; \ - ! grep -q FAIL test_network_log/*.trs + ! grep -q FAIL $(TEST_NETWORK_ALL_LOG_DIR)/*.trs need-stem-path: @if test ! -d "$$STEM_SOURCE_DIR"; then \

1 0

[tor/release-0.2.9] Test: consistently use $(TEST_NETWORK_ALL_LOG_DIR) in Makefile.am
by nickm＠torproject.org 29 Aug '18

29 Aug '18

commit 3e298633ca212447b4a230b970a293ce694ed3bb Author: teor <teor(a)torproject.org> Date: Fri Aug 24 10:20:30 2018 +1000 Test: consistently use $(TEST_NETWORK_ALL_LOG_DIR) in Makefile.am Part of 27295. --- Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index f06d0e373..b19a4bf96 100644 --- a/Makefile.am +++ b/Makefile.am @@ -128,7 +128,7 @@ test-network-all: need-chutney-path test-driver $(TESTING_TOR_BINARY) src/tools/ $(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); \ done; \ echo "Log and result files are available in $(TEST_NETWORK_ALL_LOG_DIR)."; \ - ! grep -q FAIL test_network_log/*.trs + ! grep -q FAIL $(TEST_NETWORK_ALL_LOG_DIR)/*.trs need-stem-path: @if test ! -d "$$STEM_SOURCE_DIR"; then \

1 0

[tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4
by nickm＠torproject.org 29 Aug '18

29 Aug '18

commit 0ea622aa3a678f19759a42e9521a259ef4bcf5a4 Merge: 0483f7f64 a28c14aad Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 29 11:17:31 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 Makefile.am | 3 ++- changes/bug27295 | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-)

1 0

[tor/master] Merge branch 'maint-0.3.2' into maint-0.3.3
by nickm＠torproject.org 29 Aug '18

29 Aug '18

commit a28c14aad547fd1b254bdbf2acc1ff2b67551a96 Merge: 64c3c6a79 b40f9967f Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 29 11:17:31 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 Makefile.am | 3 ++- changes/bug27295 | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --cc Makefile.am index 08cb8e3e7,34493765d..dcb445c97 --- a/Makefile.am +++ b/Makefile.am @@@ -118,19 -118,18 +118,20 @@@ test-network: need-chutney-path $(TESTI # Run all available tests using automake's test-driver # only run IPv6 tests if we can ping6 ::1 (localhost) +# only run IPv6 tests if we can ping ::1 (localhost) # some IPv6 tests will fail without an IPv6 DNS server (see #16971 and #17011) # only run mixed tests if we have a tor-stable binary -# Try both the BSD and the Linux ping6 syntax, because they're incompatible +# Try the syntax for BSD ping6, Linux ping6, and Linux ping -6, +# because they're incompatible 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; then \ - echo "ping6 ::1 succeeded, running IPv6 flavors: $(TEST_CHUTNEY_FLAVORS_IPV6)."; \ + 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 failed, skipping IPv6 flavors: $(TEST_CHUTNEY_FLAVORS_IPV6)."; \ + 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 \

1 0

[tor/master] Merge branch 'maint-0.3.4'
by nickm＠torproject.org 29 Aug '18

29 Aug '18

commit 810152b20f6d773172e1f28ab72a1d4b2fda2d82 Merge: 3d7a705d3 0ea622aa3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 29 11:17:31 2018 -0400 Merge branch 'maint-0.3.4' Makefile.am | 3 ++- changes/bug27295 | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-)

1 0

[tor/release-0.2.9] Test: avoid spurious failures in make test-network-all
by nickm＠torproject.org 29 Aug '18

29 Aug '18

commit 541b89b061455a167e73e6fc61e9df7ee82f4525 Author: teor <teor(a)torproject.org> Date: Fri Aug 24 10:25:25 2018 +1000 Test: avoid spurious failures in make test-network-all Before running make test-network-all, delete old logs and test result files, to avoid spurious failures. Fixes bug 27295; bugfix on 0.2.7.3-rc. --- Makefile.am | 1 + changes/bug27295 | 3 +++ 2 files changed, 4 insertions(+) diff --git a/Makefile.am b/Makefile.am index b19a4bf96..e4be3f26f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -106,6 +106,7 @@ test-network: need-chutney-path $(TESTING_TOR_BINARY) src/tools/tor-gencert # Try both the BSD and the Linux ping6 syntax, because they're incompatible 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; then \ echo "ping6 ::1 succeeded, running IPv6 flavors: $(TEST_CHUTNEY_FLAVORS_IPV6)."; \ diff --git a/changes/bug27295 b/changes/bug27295 new file mode 100644 index 000000000..c5a364877 --- /dev/null +++ b/changes/bug27295 @@ -0,0 +1,3 @@ + o Minor bugfixes (testing, chutney): + - Before running make test-network-all, delete old logs and test result + files, to avoid spurious failures. Fixes bug 27295; bugfix on 0.2.7.3-rc.

1 0

[tor/release-0.3.2] Test: consistently use $(TEST_NETWORK_ALL_LOG_DIR) in Makefile.am
by nickm＠torproject.org 29 Aug '18

29 Aug '18

commit 3e298633ca212447b4a230b970a293ce694ed3bb Author: teor <teor(a)torproject.org> Date: Fri Aug 24 10:20:30 2018 +1000 Test: consistently use $(TEST_NETWORK_ALL_LOG_DIR) in Makefile.am Part of 27295. --- Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index f06d0e373..b19a4bf96 100644 --- a/Makefile.am +++ b/Makefile.am @@ -128,7 +128,7 @@ test-network-all: need-chutney-path test-driver $(TESTING_TOR_BINARY) src/tools/ $(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); \ done; \ echo "Log and result files are available in $(TEST_NETWORK_ALL_LOG_DIR)."; \ - ! grep -q FAIL test_network_log/*.trs + ! grep -q FAIL $(TEST_NETWORK_ALL_LOG_DIR)/*.trs need-stem-path: @if test ! -d "$$STEM_SOURCE_DIR"; then \

1 0

[tor/release-0.3.2] Test: avoid spurious failures in make test-network-all
by nickm＠torproject.org 29 Aug '18

29 Aug '18

commit 541b89b061455a167e73e6fc61e9df7ee82f4525 Author: teor <teor(a)torproject.org> Date: Fri Aug 24 10:25:25 2018 +1000 Test: avoid spurious failures in make test-network-all Before running make test-network-all, delete old logs and test result files, to avoid spurious failures. Fixes bug 27295; bugfix on 0.2.7.3-rc. --- Makefile.am | 1 + changes/bug27295 | 3 +++ 2 files changed, 4 insertions(+) diff --git a/Makefile.am b/Makefile.am index b19a4bf96..e4be3f26f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -106,6 +106,7 @@ test-network: need-chutney-path $(TESTING_TOR_BINARY) src/tools/tor-gencert # Try both the BSD and the Linux ping6 syntax, because they're incompatible 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; then \ echo "ping6 ::1 succeeded, running IPv6 flavors: $(TEST_CHUTNEY_FLAVORS_IPV6)."; \ diff --git a/changes/bug27295 b/changes/bug27295 new file mode 100644 index 000000000..c5a364877 --- /dev/null +++ b/changes/bug27295 @@ -0,0 +1,3 @@ + o Minor bugfixes (testing, chutney): + - Before running make test-network-all, delete old logs and test result + files, to avoid spurious failures. Fixes bug 27295; bugfix on 0.2.7.3-rc.

1 0

[tor/release-0.3.2] Merge branch 'maint-0.2.9' into maint-0.3.2
by nickm＠torproject.org 29 Aug '18

29 Aug '18

commit b40f9967fa31faa1dcf1a977989e235fbe836015 Merge: 70a07fa90 541b89b06 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 29 11:17:31 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.2 Makefile.am | 3 ++- changes/bug27295 | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --cc Makefile.am index 4d2d9d222,e4be3f26f..34493765d --- a/Makefile.am +++ b/Makefile.am @@@ -143,10 -127,9 +144,10 @@@ test-network-all: need-chutney-path tes 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_WARNING_FLAGS); \ done; \ echo "Log and result files are available in $(TEST_NETWORK_ALL_LOG_DIR)."; \ - ! grep -q FAIL test_network_log/*.trs + ! grep -q FAIL $(TEST_NETWORK_ALL_LOG_DIR)/*.trs need-stem-path: @if test ! -d "$$STEM_SOURCE_DIR"; then \

1 0