commit 42ea03eb7f7e380016ed5440697a81cebe731aa1 Merge: cb69a5a11 ee3d23c05 Author: Nick Mathewson nickm@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: