diff options
author | teor <teor@torproject.org> | 2020-03-20 11:24:44 +1000 |
---|---|---|
committer | teor <teor@torproject.org> | 2020-03-20 11:24:44 +1000 |
commit | b056b80ea88a63ed04413df57487f604262a4df8 (patch) | |
tree | 0683100be6c6e0fc8abda630ac10c9fb99d5fc4e | |
parent | e065f08fe8bca501fdec0bfb91ae4270fa5c7ed6 (diff) | |
parent | ee3d23c05a828dc693ead2dcf083c9091d502425 (diff) | |
download | tor-b056b80ea88a63ed04413df57487f604262a4df8.tar.gz tor-b056b80ea88a63ed04413df57487f604262a4df8.zip |
Merge branch 'maint-0.3.5' into release-0.3.5
-rw-r--r-- | .appveyor.yml | 2 | ||||
-rw-r--r-- | changes/ticket33643 | 5 | ||||
-rw-r--r-- | changes/ticket33643_part2 | 3 | ||||
-rw-r--r-- | src/test/testing_common.c | 15 |
4 files changed, 24 insertions, 1 deletions
diff --git a/.appveyor.yml b/.appveyor.yml index 818e074a4e..c4f3d99841 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 b/changes/ticket33643 new file mode 100644 index 0000000000..7fddab74eb --- /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/changes/ticket33643_part2 b/changes/ticket33643_part2 new file mode 100644 index 0000000000..28193d2af5 --- /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. diff --git a/src/test/testing_common.c b/src/test/testing_common.c index 62d40a42fa..2c9c4538b9 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(); |