March 2017 - tor-commits - lists.torproject.org

[chutney/master] Fix a comment typo in test-network.sh
by teor＠torproject.org 01 Mar '17

01 Mar '17

commit 125b2e61e21c263e705c4c42afcaedb581078a3e Author: teor <teor2345(a)gmail.com> Date: Wed Mar 1 12:16:37 2017 +1100 Fix a comment typo in test-network.sh --- tools/test-network.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/test-network.sh b/tools/test-network.sh index 0c8d795..9da20b1 100755 --- a/tools/test-network.sh +++ b/tools/test-network.sh @@ -141,7 +141,7 @@ done # optional: $TOR_DIR is the tor build directory # it's used to find the location of tor binaries # if it's not set: -# - set it ro $BUILDDIR, or +# - set it to $BUILDDIR, or # - if $PWD looks like a tor build directory, set it to $PWD, or # - unset $TOR_DIR, and let chutney fall back to finding tor binaries in $PATH if [ ! -d "$TOR_DIR" ]; then

1 0

[tor/maint-0.3.0] Remove a spurious test-network-all warning that triggers when sh is not bash
by nickm＠torproject.org 01 Mar '17

01 Mar '17

commit a3bec9aa5a023c39f04d863c21cef779cb590e85 Author: teor <teor2345(a)gmail.com> Date: Wed Mar 1 11:54:31 2017 +1100 Remove a spurious test-network-all warning that triggers when sh is not bash Part of 21581. --- Makefile.am | 3 --- 1 file changed, 3 deletions(-) diff --git a/Makefile.am b/Makefile.am index 880420b..3d50594 100644 --- a/Makefile.am +++ b/Makefile.am @@ -137,9 +137,6 @@ test-network-all: need-chutney-path test-driver $(TESTING_TOR_BINARY) src/tools/ 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); \ - if test $$? -eq 2 ; then \ - echo "Please update your chutney using 'git pull' to see tor warnings here."; \ - fi; \ done; \ echo "Log and result files are available in $(TEST_NETWORK_ALL_LOG_DIR)."; \ ! grep -q FAIL test_network_log/*.trs

1 0

[tor/maint-0.3.0] Restore support for test-network.sh on BSD and other systems without bash
by nickm＠torproject.org 01 Mar '17

01 Mar '17

commit 004ec8dc58078e6f4ab90f603ce3a9df3dd9e065 Author: teor <teor2345(a)gmail.com> Date: Wed Mar 1 11:21:07 2017 +1100 Restore support for test-network.sh on BSD and other systems without bash (But use bash if it's available.) This is a workaround until we remove bash-specific code in 19699. Fixes bug 21581; bugfix on 21562, not in any released version of tor. --- changes/bug21581 | 5 +++++ src/test/test-network.sh | 19 ++++++++++++++++--- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/changes/bug21581 b/changes/bug21581 new file mode 100644 index 0000000..1077719 --- /dev/null +++ b/changes/bug21581 @@ -0,0 +1,5 @@ + o Minor bugfixes (testing): + - Restore support for test-network.sh on BSD and other systems without + bash. (But use bash if it's available.) This is a workaround until we + remove bash-specific code in 19699. + Fixes bug 21581; bugfix on 21562, not in any released version of tor. diff --git a/src/test/test-network.sh b/src/test/test-network.sh index cb10f72..edd2897 100755 --- a/src/test/test-network.sh +++ b/src/test/test-network.sh @@ -1,9 +1,19 @@ -#! /bin/bash +#! /bin/sh + +# use bash if it is available, as this script doesn't work well in non-bash sh +# this will be fixed in #19699 +# there is no simple, portable way of checking the name of the shell, so we +# exec bash even when sh is bash +if [ -x /bin/bash -a "$USING_BASH" != true ]; then + # only do this once + export USING_BASH=true + exec /bin/bash "$0" "$@" +fi # Please do not modify this script, it has been moved to chutney/tools -export ECHO=${ECHO:-"echo"} -export ECHO_N=${ECHO_N:-"/bin/echo -n"} +export ECHO="${ECHO:-echo}" +export ECHO_N="${ECHO_N:-/bin/echo -n}" # Output is prefixed with the name of the script myname=$(basename $0) @@ -21,6 +31,8 @@ if [ "$TEST_NETWORK_RECURSING" != true ]; then # can be removed, because this script will find chutney, then pass all # arguments to chutney's test-network.sh export TEST_NETWORK_RECURSING=true + # passing arguments to a sourced script only works in bash + # this will be fixed in #19699 . "$0" --dry-run "$@" # Call the chutney version of this script, if it exists, and we can find it @@ -179,6 +191,7 @@ export CHUTNEY_NETWORK=networks/$NETWORK_FLAVOUR if [ "$NETWORK_DRY_RUN" = true ]; then # we can't exit here, it breaks argument processing # this only works in bash: return semantics are shell-specific + # this will be fixed in #19699 return 2>/dev/null || exit fi

1 0

[tor/master] Restore support for test-network.sh on BSD and other systems without bash
by nickm＠torproject.org 01 Mar '17

01 Mar '17

commit 004ec8dc58078e6f4ab90f603ce3a9df3dd9e065 Author: teor <teor2345(a)gmail.com> Date: Wed Mar 1 11:21:07 2017 +1100 Restore support for test-network.sh on BSD and other systems without bash (But use bash if it's available.) This is a workaround until we remove bash-specific code in 19699. Fixes bug 21581; bugfix on 21562, not in any released version of tor. --- changes/bug21581 | 5 +++++ src/test/test-network.sh | 19 ++++++++++++++++--- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/changes/bug21581 b/changes/bug21581 new file mode 100644 index 0000000..1077719 --- /dev/null +++ b/changes/bug21581 @@ -0,0 +1,5 @@ + o Minor bugfixes (testing): + - Restore support for test-network.sh on BSD and other systems without + bash. (But use bash if it's available.) This is a workaround until we + remove bash-specific code in 19699. + Fixes bug 21581; bugfix on 21562, not in any released version of tor. diff --git a/src/test/test-network.sh b/src/test/test-network.sh index cb10f72..edd2897 100755 --- a/src/test/test-network.sh +++ b/src/test/test-network.sh @@ -1,9 +1,19 @@ -#! /bin/bash +#! /bin/sh + +# use bash if it is available, as this script doesn't work well in non-bash sh +# this will be fixed in #19699 +# there is no simple, portable way of checking the name of the shell, so we +# exec bash even when sh is bash +if [ -x /bin/bash -a "$USING_BASH" != true ]; then + # only do this once + export USING_BASH=true + exec /bin/bash "$0" "$@" +fi # Please do not modify this script, it has been moved to chutney/tools -export ECHO=${ECHO:-"echo"} -export ECHO_N=${ECHO_N:-"/bin/echo -n"} +export ECHO="${ECHO:-echo}" +export ECHO_N="${ECHO_N:-/bin/echo -n}" # Output is prefixed with the name of the script myname=$(basename $0) @@ -21,6 +31,8 @@ if [ "$TEST_NETWORK_RECURSING" != true ]; then # can be removed, because this script will find chutney, then pass all # arguments to chutney's test-network.sh export TEST_NETWORK_RECURSING=true + # passing arguments to a sourced script only works in bash + # this will be fixed in #19699 . "$0" --dry-run "$@" # Call the chutney version of this script, if it exists, and we can find it @@ -179,6 +191,7 @@ export CHUTNEY_NETWORK=networks/$NETWORK_FLAVOUR if [ "$NETWORK_DRY_RUN" = true ]; then # we can't exit here, it breaks argument processing # this only works in bash: return semantics are shell-specific + # this will be fixed in #19699 return 2>/dev/null || exit fi

1 0

[tor/master] Make display of captured unit test log messages consistent
by nickm＠torproject.org 01 Mar '17

01 Mar '17

commit 7a65abf566d9a66f2792e9f83480ca42e0574b43 Author: teor <teor2345(a)gmail.com> Date: Sun Feb 19 23:09:50 2017 +1100 Make display of captured unit test log messages consistent There was a missing space and an extra colon. Fixes bug 21510; bugfix on 0.2.9.3-alpha. --- changes/bug21510 | 4 ++++ src/test/log_test_helpers.h | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/changes/bug21510 b/changes/bug21510 new file mode 100644 index 0000000..31c3e1a --- /dev/null +++ b/changes/bug21510 @@ -0,0 +1,4 @@ + o Minor bugfixes (unit tests): + - Make display of captured unit test log messages consistent. + Fixes bug 21510; bugfix on 0.2.9.3-alpha. + diff --git a/src/test/log_test_helpers.h b/src/test/log_test_helpers.h index 922c68b..19c5a88 100644 --- a/src/test/log_test_helpers.h +++ b/src/test/log_test_helpers.h @@ -71,14 +71,14 @@ void mock_dump_saved_logs(void); \ assert_log_predicate(mock_saved_log_has_message_containing(str) && \ mock_saved_log_n_entries() == 1, \ - "expected log to contain exactly 1 message: " # str); \ + "expected log to contain exactly 1 message " # str); \ } while (0); #define expect_single_log_msg_containing(str) \ do { \ assert_log_predicate(mock_saved_log_has_message_containing(str)&& \ mock_saved_log_n_entries() == 1 , \ - "expected log to contain 1 message, containing" # str); \ + "expected log to contain 1 message, containing " # str); \ } while (0); #define expect_no_log_msg(str) \

1 0

[tor/master] Merge remote-tracking branch 'teor/bug21510'
by nickm＠torproject.org 01 Mar '17

01 Mar '17

commit 1cd7a697f1ba96898580d4e6c6412bb245f853d1 Merge: aa50758 7a65abf Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 28 11:43:58 2017 -0500 Merge remote-tracking branch 'teor/bug21510' changes/bug21510 | 4 ++++ src/test/log_test_helpers.h | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-)

1 0

[tor/master] Remove a spurious test-network-all warning that triggers when sh is not bash
by nickm＠torproject.org 01 Mar '17

01 Mar '17

commit a3bec9aa5a023c39f04d863c21cef779cb590e85 Author: teor <teor2345(a)gmail.com> Date: Wed Mar 1 11:54:31 2017 +1100 Remove a spurious test-network-all warning that triggers when sh is not bash Part of 21581. --- Makefile.am | 3 --- 1 file changed, 3 deletions(-) diff --git a/Makefile.am b/Makefile.am index 880420b..3d50594 100644 --- a/Makefile.am +++ b/Makefile.am @@ -137,9 +137,6 @@ test-network-all: need-chutney-path test-driver $(TESTING_TOR_BINARY) src/tools/ 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); \ - if test $$? -eq 2 ; then \ - echo "Please update your chutney using 'git pull' to see tor warnings here."; \ - fi; \ done; \ echo "Log and result files are available in $(TEST_NETWORK_ALL_LOG_DIR)."; \ ! grep -q FAIL test_network_log/*.trs

1 0

[tor/master] Merge branch 'maint-0.3.0'
by nickm＠torproject.org 01 Mar '17

01 Mar '17

commit 8e3d929df7c497c83c2f34aae9fd9c88545072d3 Merge: 1cd7a69 a3bec9a Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 28 20:14:06 2017 -0500 Merge branch 'maint-0.3.0' Makefile.am | 3 --- changes/bug21581 | 5 +++++ src/test/test-network.sh | 19 ++++++++++++++++--- 3 files changed, 21 insertions(+), 6 deletions(-)

1 0

[tor/release-0.3.0] Remove a spurious test-network-all warning that triggers when sh is not bash
by nickm＠torproject.org 01 Mar '17

01 Mar '17

commit a3bec9aa5a023c39f04d863c21cef779cb590e85 Author: teor <teor2345(a)gmail.com> Date: Wed Mar 1 11:54:31 2017 +1100 Remove a spurious test-network-all warning that triggers when sh is not bash Part of 21581. --- Makefile.am | 3 --- 1 file changed, 3 deletions(-) diff --git a/Makefile.am b/Makefile.am index 880420b..3d50594 100644 --- a/Makefile.am +++ b/Makefile.am @@ -137,9 +137,6 @@ test-network-all: need-chutney-path test-driver $(TESTING_TOR_BINARY) src/tools/ 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); \ - if test $$? -eq 2 ; then \ - echo "Please update your chutney using 'git pull' to see tor warnings here."; \ - fi; \ done; \ echo "Log and result files are available in $(TEST_NETWORK_ALL_LOG_DIR)."; \ ! grep -q FAIL test_network_log/*.trs

1 0

[tor/release-0.3.0] Merge branch 'maint-0.3.0' into release-0.3.0
by nickm＠torproject.org 01 Mar '17

01 Mar '17

commit 909493604072e371d05d622a9ee1554e6cb7313b Merge: cf9844f a3bec9a Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 28 20:13:54 2017 -0500 Merge branch 'maint-0.3.0' into release-0.3.0 Makefile.am | 3 --- changes/bug21581 | 5 +++++ src/test/test-network.sh | 19 ++++++++++++++++--- 3 files changed, 21 insertions(+), 6 deletions(-)

1 0