]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'ticket33643_skip_035' into ticket33643_skip_041
authorNick Mathewson <nickm@torproject.org>
Thu, 19 Mar 2020 22:38:18 +0000 (18:38 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 19 Mar 2020 22:38:18 +0000 (18:38 -0400)
1  2 
.appveyor.yml
src/test/testing_common.c

diff --cc .appveyor.yml
index 7e08602fe3015a2637ae8f6c30ae6b8c45542bbf,c4f3d998411b4a698530cbfbdbd3a2b3a0c8c8b9..7841b963ffaa3f7b08e31bf21f6c974114da41e3
@@@ -95,9 -95,7 +95,9 @@@ 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"
 +            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 TOR_SKIP_TESTCASES=crypto/openssl_version make -k -j2 check"
      }
  
  on_finish:
Simple merge