Commit 42ea03eb authored by Nick Mathewson's avatar Nick Mathewson
Browse files

Merge branch 'ticket33643_skip_035' into ticket33643_skip_041

parents cb69a5a1 ee3d23c0
...@@ -97,7 +97,7 @@ test_script: ...@@ -97,7 +97,7 @@ test_script:
Set-Location "${env:build}" 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/libssp-0.dll" -Destination "${env:build}/src/test"
Copy-Item "C:/msys64/${env:compiler_path}/bin/zlib1.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: on_finish:
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.
o Testing (CI):
- On appveyor, skip the crypto/openssl_version test, which is failing
because of a mismatched library installation. Fix for 33643.
...@@ -343,6 +343,21 @@ main(int c, const char **v) ...@@ -343,6 +343,21 @@ main(int c, const char **v)
atexit(remove_directory); 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,
int n = 0;
SMARTLIST_FOREACH_BEGIN(skip, char *, cp) {
n += tinytest_skip(testgroups, cp);
printf("Skipping %d testcases.\n", n);
int have_failed = (tinytest_main(c, v, testgroups) != 0); int have_failed = (tinytest_main(c, v, testgroups) != 0);
free_pregenerated_keys(); free_pregenerated_keys();
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment