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

[tor/release-0.4.3] Merge branch 'maint-0.4.3' into release-0.4.3
by teor＠torproject.org 20 Mar '20

20 Mar '20

commit 23d0dba7add41c08b227aaeb8321a9330a9d3680 Merge: 422530144 250b8499b Author: teor <teor(a)torproject.org> Date: Fri Mar 20 15:40:35 2020 +1000 Merge branch 'maint-0.4.3' into release-0.4.3 src/feature/dirauth/dirauth_config.h | 2 -- 1 file changed, 2 deletions(-)

1 0

[tor/maint-0.4.3] dirauth: Remove a duplicate macro definition
by teor＠torproject.org 20 Mar '20

20 Mar '20

commit 250b8499b89217493d1b41c241ec81ae4e0fe206 Author: teor <teor(a)torproject.org> Date: Fri Mar 20 15:39:55 2020 +1000 dirauth: Remove a duplicate macro definition Obviously correct changes to already-reviewed code. --- src/feature/dirauth/dirauth_config.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/feature/dirauth/dirauth_config.h b/src/feature/dirauth/dirauth_config.h index 1ec599717..ede1207a8 100644 --- a/src/feature/dirauth/dirauth_config.h +++ b/src/feature/dirauth/dirauth_config.h @@ -69,8 +69,6 @@ options_validate_dirauth_mode(const struct or_options_t *old_options, (((void)(old_options)),((void)(options)),((void)(msg)),0) #define options_validate_dirauth_testing(old_options, options, msg) \ (((void)(old_options)),((void)(options)),((void)(msg)),0) -#define options_validate_dirauth_testing(old_options, options, msg) \ - (((void)(old_options)),((void)(options)),((void)(msg)),0) #define options_act_dirauth(old_options) \ (((void)(old_options)),0)

1 0

[tor/master] Merge branch 'maint-0.4.3'
by teor＠torproject.org 20 Mar '20

20 Mar '20

commit 2f1f3b17021046bc3f1f461dbefe27f4aba02445 Merge: 4bb06cae2 250b8499b Author: teor <teor(a)torproject.org> Date: Fri Mar 20 15:40:39 2020 +1000 Merge branch 'maint-0.4.3' src/feature/dirauth/dirauth_config.h | 2 -- 1 file changed, 2 deletions(-)

1 0

[tor/master] dirauth: Remove a duplicate macro definition
by teor＠torproject.org 20 Mar '20

20 Mar '20

commit 250b8499b89217493d1b41c241ec81ae4e0fe206 Author: teor <teor(a)torproject.org> Date: Fri Mar 20 15:39:55 2020 +1000 dirauth: Remove a duplicate macro definition Obviously correct changes to already-reviewed code. --- src/feature/dirauth/dirauth_config.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/feature/dirauth/dirauth_config.h b/src/feature/dirauth/dirauth_config.h index 1ec599717..ede1207a8 100644 --- a/src/feature/dirauth/dirauth_config.h +++ b/src/feature/dirauth/dirauth_config.h @@ -69,8 +69,6 @@ options_validate_dirauth_mode(const struct or_options_t *old_options, (((void)(old_options)),((void)(options)),((void)(msg)),0) #define options_validate_dirauth_testing(old_options, options, msg) \ (((void)(old_options)),((void)(options)),((void)(msg)),0) -#define options_validate_dirauth_testing(old_options, options, msg) \ - (((void)(old_options)),((void)(options)),((void)(msg)),0) #define options_act_dirauth(old_options) \ (((void)(old_options)),0)

1 0

[chutney/master] TorNet: update a comment
by teor＠torproject.org 19 Mar '20

19 Mar '20

commit 76981f086d29176c05d060acc8acb9b4d01886cd Author: teor <teor(a)torproject.org> Date: Fri Mar 20 11:53:44 2020 +1000 TorNet: update a comment Microdescriptor search in #33428 is almost finished, so change the comment to refer to onion service descriptor search in #33609. --- lib/chutney/TorNet.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/chutney/TorNet.py b/lib/chutney/TorNet.py index ff20726..b2fde0c 100644 --- a/lib/chutney/TorNet.py +++ b/lib/chutney/TorNet.py @@ -2274,7 +2274,7 @@ class Network(object): # condition where: # - all the directory info that chutney checks is present, # - but some unchecked dir info is missing - # (perhaps microdescriptors, see #33428) + # (perhaps onion service descriptors, see #33609) # or some other state or connection isn't quite ready, and # - chutney's SOCKS connection puts tor in a failing state, # which affects tor for at least 10 seconds.

1 0

[tor/release-0.3.5] Appveyor: disable crypto/openssl_version
by teor＠torproject.org 19 Mar '20

19 Mar '20

commit ee3d23c05a828dc693ead2dcf083c9091d502425 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Mar 19 15:28:55 2020 -0400 Appveyor: disable crypto/openssl_version --- .appveyor.yml | 2 +- changes/ticket33643_part2 | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.appveyor.yml b/.appveyor.yml index 818e074a4..c4f3d9984 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -95,7 +95,7 @@ test_script: $buildpath = @("C:\msys64\${env:compiler_path}\bin") + $oldpath $env:Path = $buildpath -join ';' Set-Location "${env:build}" - Execute-Bash "VERBOSE=1 make -k -j2 check" + Execute-Bash "VERBOSE=1 TOR_SKIP_TESTCASES=crypto/openssl_version make -k -j2 check" } on_finish: diff --git a/changes/ticket33643_part2 b/changes/ticket33643_part2 new file mode 100644 index 000000000..28193d2af --- /dev/null +++ b/changes/ticket33643_part2 @@ -0,0 +1,3 @@ + o Testing (CI): + - On appveyor, skip the crypto/openssl_version test, which is failing + because of a mismatched library installation. Fix for 33643.

1 0

[tor/release-0.3.5] Add a TOR_SKIP_TESTCASES environment variable for suppressing tests.
by teor＠torproject.org 19 Mar '20

19 Mar '20

commit 6bafe97bc1e9c66e5e727cdf5160341ae58b4f81 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Mar 19 15:25:11 2020 -0400 Add a TOR_SKIP_TESTCASES environment variable for suppressing tests. For example, "TOR_SKIP_TESTCASES=crypto/.. ./src/test/test" will run the tests and suppress all the "crypto/" tests. You could get the same effect by running "./src/test/test :crypto/..", but that can be harder to arrange from CI. Part of a fix/workaround for 33643. --- changes/ticket33643 | 5 +++++ src/test/testing_common.c | 15 +++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/changes/ticket33643 b/changes/ticket33643 new file mode 100644 index 000000000..7fddab74e --- /dev/null +++ b/changes/ticket33643 @@ -0,0 +1,5 @@ + o Minor features (testing): + - The unit tests now support a "TOR_SKIP_TESTCASES" environment variable + to specify a list of space-separated test cases that should not be + executed. We will use this to disable certain tests that are failing on + Appveyor because of mismatched OpenSSL libraries. Part of ticket 33643. diff --git a/src/test/testing_common.c b/src/test/testing_common.c index 62d40a42f..2c9c4538b 100644 --- a/src/test/testing_common.c +++ b/src/test/testing_common.c @@ -348,6 +348,21 @@ main(int c, const char **v) atexit(remove_directory); + /* Look for TOR_SKIP_TESTCASES: a space-separated list of tests to skip. */ + const char *skip_tests = getenv("TOR_SKIP_TESTCASES"); + if (skip_tests) { + smartlist_t *skip = smartlist_new(); + smartlist_split_string(skip, skip_tests, NULL, + SPLIT_IGNORE_BLANK, -1); + int n = 0; + SMARTLIST_FOREACH_BEGIN(skip, char *, cp) { + n += tinytest_skip(testgroups, cp); + tor_free(cp); + } SMARTLIST_FOREACH_END(cp); + printf("Skipping %d testcases.\n", n); + smartlist_free(skip); + } + int have_failed = (tinytest_main(c, v, testgroups) != 0); free_pregenerated_keys();

1 0

[tor/release-0.4.1] Add a TOR_SKIP_TESTCASES environment variable for suppressing tests.
by teor＠torproject.org 19 Mar '20

19 Mar '20

commit 6bafe97bc1e9c66e5e727cdf5160341ae58b4f81 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Mar 19 15:25:11 2020 -0400 Add a TOR_SKIP_TESTCASES environment variable for suppressing tests. For example, "TOR_SKIP_TESTCASES=crypto/.. ./src/test/test" will run the tests and suppress all the "crypto/" tests. You could get the same effect by running "./src/test/test :crypto/..", but that can be harder to arrange from CI. Part of a fix/workaround for 33643. --- changes/ticket33643 | 5 +++++ src/test/testing_common.c | 15 +++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/changes/ticket33643 b/changes/ticket33643 new file mode 100644 index 000000000..7fddab74e --- /dev/null +++ b/changes/ticket33643 @@ -0,0 +1,5 @@ + o Minor features (testing): + - The unit tests now support a "TOR_SKIP_TESTCASES" environment variable + to specify a list of space-separated test cases that should not be + executed. We will use this to disable certain tests that are failing on + Appveyor because of mismatched OpenSSL libraries. Part of ticket 33643. diff --git a/src/test/testing_common.c b/src/test/testing_common.c index 62d40a42f..2c9c4538b 100644 --- a/src/test/testing_common.c +++ b/src/test/testing_common.c @@ -348,6 +348,21 @@ main(int c, const char **v) atexit(remove_directory); + /* Look for TOR_SKIP_TESTCASES: a space-separated list of tests to skip. */ + const char *skip_tests = getenv("TOR_SKIP_TESTCASES"); + if (skip_tests) { + smartlist_t *skip = smartlist_new(); + smartlist_split_string(skip, skip_tests, NULL, + SPLIT_IGNORE_BLANK, -1); + int n = 0; + SMARTLIST_FOREACH_BEGIN(skip, char *, cp) { + n += tinytest_skip(testgroups, cp); + tor_free(cp); + } SMARTLIST_FOREACH_END(cp); + printf("Skipping %d testcases.\n", n); + smartlist_free(skip); + } + int have_failed = (tinytest_main(c, v, testgroups) != 0); free_pregenerated_keys();

1 0

[tor/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
by teor＠torproject.org 19 Mar '20

19 Mar '20

commit b056b80ea88a63ed04413df57487f604262a4df8 Merge: e065f08fe ee3d23c05 Author: teor <teor(a)torproject.org> Date: Fri Mar 20 11:24:44 2020 +1000 Merge branch 'maint-0.3.5' into release-0.3.5 .appveyor.yml | 2 +- changes/ticket33643 | 5 +++++ changes/ticket33643_part2 | 3 +++ src/test/testing_common.c | 15 +++++++++++++++ 4 files changed, 24 insertions(+), 1 deletion(-)

1 0

[tor/release-0.4.1] Appveyor: disable crypto/openssl_version
by teor＠torproject.org 19 Mar '20

19 Mar '20

commit ee3d23c05a828dc693ead2dcf083c9091d502425 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Mar 19 15:28:55 2020 -0400 Appveyor: disable crypto/openssl_version --- .appveyor.yml | 2 +- changes/ticket33643_part2 | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.appveyor.yml b/.appveyor.yml index 818e074a4..c4f3d9984 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -95,7 +95,7 @@ test_script: $buildpath = @("C:\msys64\${env:compiler_path}\bin") + $oldpath $env:Path = $buildpath -join ';' Set-Location "${env:build}" - Execute-Bash "VERBOSE=1 make -k -j2 check" + Execute-Bash "VERBOSE=1 TOR_SKIP_TESTCASES=crypto/openssl_version make -k -j2 check" } on_finish: diff --git a/changes/ticket33643_part2 b/changes/ticket33643_part2 new file mode 100644 index 000000000..28193d2af --- /dev/null +++ b/changes/ticket33643_part2 @@ -0,0 +1,3 @@ + o Testing (CI): + - On appveyor, skip the crypto/openssl_version test, which is failing + because of a mismatched library installation. Fix for 33643.

1 0