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

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

19 Mar '20

commit 3aa855dc6877fc281082e2cdaba242d2cc06430f Merge: 190cda0e2 42ea03eb7 Author: teor <teor(a)torproject.org> Date: Fri Mar 20 11:24:51 2020 +1000 Merge branch 'maint-0.4.1' into maint-0.4.2 .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.3] Merge branch 'maint-0.4.3' into release-0.4.3
by teor＠torproject.org 19 Mar '20

19 Mar '20

commit 42253014441e1ad538c72631250f43f258ff4c08 Merge: 3a86a4fe6 eb2d08a72 Author: teor <teor(a)torproject.org> Date: Fri Mar 20 11:25:01 2020 +1000 Merge branch 'maint-0.4.3' into release-0.4.3 .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.3] Merge branch 'maint-0.4.2' into maint-0.4.3
by teor＠torproject.org 19 Mar '20

19 Mar '20

commit eb2d08a72c165ee941607c1b2cc591fb4b5e631b Merge: 725efb7c9 3aa855dc6 Author: teor <teor(a)torproject.org> Date: Fri Mar 20 11:24:57 2020 +1000 Merge branch 'maint-0.4.2' into maint-0.4.3 .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/maint-0.4.3] Merge branch 'ticket33643_skip_035' into ticket33643_skip_041
by teor＠torproject.org 19 Mar '20

19 Mar '20

commit 42ea03eb7f7e380016ed5440697a81cebe731aa1 Merge: cb69a5a11 ee3d23c05 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Mar 19 18:38:18 2020 -0400 Merge branch 'ticket33643_skip_035' into ticket33643_skip_041 .appveyor.yml | 2 +- changes/ticket33643 | 5 +++++ changes/ticket33643_part2 | 3 +++ src/test/testing_common.c | 15 +++++++++++++++ 4 files changed, 24 insertions(+), 1 deletion(-) diff --cc .appveyor.yml index 7e08602fe,c4f3d9984..7841b963f --- a/.appveyor.yml +++ b/.appveyor.yml @@@ -95,9 -95,7 +95,9 @@@ test_script $buildpath = @("C:\msys64\${env:compiler_path}\bin") + $oldpath $env:Path = $buildpath -join ';' Set-Location "${env:build}" + Copy-Item "C:/msys64/${env:compiler_path}/bin/libssp-0.dll" -Destination "${env:build}/src/test" + Copy-Item "C:/msys64/${env:compiler_path}/bin/zlib1.dll" -Destination "${env:build}/src/test" - Execute-Bash "VERBOSE=1 make -k -j2 check" + Execute-Bash "VERBOSE=1 TOR_SKIP_TESTCASES=crypto/openssl_version make -k -j2 check" } on_finish:

1 0

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

19 Mar '20

commit eb2d08a72c165ee941607c1b2cc591fb4b5e631b Merge: 725efb7c9 3aa855dc6 Author: teor <teor(a)torproject.org> Date: Fri Mar 20 11:24:57 2020 +1000 Merge branch 'maint-0.4.2' into maint-0.4.3 .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/maint-0.4.3] 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/maint-0.4.3] 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/maint-0.4.3] Merge branch 'maint-0.4.1' into maint-0.4.2
by teor＠torproject.org 19 Mar '20

19 Mar '20

commit 3aa855dc6877fc281082e2cdaba242d2cc06430f Merge: 190cda0e2 42ea03eb7 Author: teor <teor(a)torproject.org> Date: Fri Mar 20 11:24:51 2020 +1000 Merge branch 'maint-0.4.1' into maint-0.4.2 .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/maint-0.4.2] Merge branch 'ticket33643_skip_035' into ticket33643_skip_041
by teor＠torproject.org 19 Mar '20

19 Mar '20

commit 42ea03eb7f7e380016ed5440697a81cebe731aa1 Merge: cb69a5a11 ee3d23c05 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Mar 19 18:38:18 2020 -0400 Merge branch 'ticket33643_skip_035' into ticket33643_skip_041 .appveyor.yml | 2 +- changes/ticket33643 | 5 +++++ changes/ticket33643_part2 | 3 +++ src/test/testing_common.c | 15 +++++++++++++++ 4 files changed, 24 insertions(+), 1 deletion(-) diff --cc .appveyor.yml index 7e08602fe,c4f3d9984..7841b963f --- a/.appveyor.yml +++ b/.appveyor.yml @@@ -95,9 -95,7 +95,9 @@@ test_script $buildpath = @("C:\msys64\${env:compiler_path}\bin") + $oldpath $env:Path = $buildpath -join ';' Set-Location "${env:build}" + Copy-Item "C:/msys64/${env:compiler_path}/bin/libssp-0.dll" -Destination "${env:build}/src/test" + Copy-Item "C:/msys64/${env:compiler_path}/bin/zlib1.dll" -Destination "${env:build}/src/test" - Execute-Bash "VERBOSE=1 make -k -j2 check" + Execute-Bash "VERBOSE=1 TOR_SKIP_TESTCASES=crypto/openssl_version make -k -j2 check" } on_finish:

1 0

[tor/maint-0.4.2] 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