commit 38e07b88fac51f2a778e7c77e2269546c1344dff
Author: teor <t...@torproject.org>
Date: Thu Mar 19 17:35:49 2020 +1000
Appveyor: Copy required DLLs to test and app
Copy required DLLs to test and app, before running tor's tests.
This ensures that tor.exe and test*.exe use the correct version of each
DLL. This fix is not required, but we hope it will avoid DLL search
issues in future.
Closes bug 33673; bugfix on 0.3.4.2-alpha.
---
.appveyor.yml | 14 ++++++++++++++
changes/bug33673 | 6 ++++++
2 files changed, 20 insertions(+)
diff --git a/.appveyor.yml b/.appveyor.yml
index c4f3d9984..dbe52d9ea 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -61,6 +61,9 @@ install:
# unprefixed packages are from MSYS2, which is like Cygwin. Avoid them.
#
# Use pacman --debug to show package downloads and install locations
+ #
+ # All installed library dlls must be copied to the test and app
+ # directories, before running tor's tests. (See below.)
#>
Execute-Command "C:\msys64\usr\bin\pacman" -Sy --verbose --needed
--noconfirm ${env:mingw_prefix}-libevent ${env:mingw_prefix}-openssl
${env:mingw_prefix}-pkg-config ${env:mingw_prefix}-xz ${env:mingw_prefix}-zstd ;
@@ -95,6 +98,17 @@ test_script:
$buildpath = @("C:\msys64\${env:compiler_path}\bin") + $oldpath
$env:Path = $buildpath -join ';'
Set-Location "${env:build}"
+ <# Some compiler dlls must be copied to the test and app
+ # directories, before running tor's tests.
+ #>
+ Copy-Item
"C:/msys64/${env:compiler_path}/bin/libssp-0.dll","C:/msys64/${env:compiler_path}/bin/zlib1.dll"
-Destination "${env:build}/src/test"
+ Copy-Item
"C:/msys64/${env:compiler_path}/bin/libssp-0.dll","C:/msys64/${env:compiler_path}/bin/zlib1.dll"
-Destination "${env:build}/src/app"
+ <# All installed library dlls must be copied to the test and app
+ # directories, before running tor's tests.
+ # (See install command above.)
+ #>
+ Copy-Item
"C:/${env:compiler_path}/bin/libcrypto*.dll","C:/${env:compiler_path}/bin/libssl*.dll","C:/${env:compiler_path}/bin/liblzma*.dll","C:/${env:compiler_path}/bin/libevent*.dll","C:/${env:compiler_path}/bin/libzstd*.dll"
-Destination "${env:build}/src/test"
+ Copy-Item
"C:/${env:compiler_path}/bin/libcrypto*.dll","C:/${env:compiler_path}/bin/libssl*.dll","C:/${env:compiler_path}/bin/liblzma*.dll","C:/${env:compiler_path}/bin/libevent*.dll","C:/${env:compiler_path}/bin/libzstd*.dll"
-Destination "${env:build}/src/app"
Execute-Bash "VERBOSE=1 TOR_SKIP_TESTCASES=crypto/openssl_version
make -k -j2 check"
}
diff --git a/changes/bug33673 b/changes/bug33673
new file mode 100644
index 000000000..37c00f2e6
--- /dev/null
+++ b/changes/bug33673
@@ -0,0 +1,6 @@
+ o Testing:
+ - In our Appveyor Windows CI, copy required DLLs to test and app, before
+ running tor's tests. This ensures that tor.exe and test*.exe use the
+ correct version of each DLL. This fix is not required, but we hope it
+ will avoid DLL search issues in future.
+ Fixes bug 33673; bugfix on 0.3.4.2-alpha.
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
