summaryrefslogtreecommitdiff
path: root/other/travis/env-windows.sh
diff options
context:
space:
mode:
Diffstat (limited to 'other/travis/env-windows.sh')
-rw-r--r--other/travis/env-windows.sh13
1 files changed, 5 insertions, 8 deletions
diff --git a/other/travis/env-windows.sh b/other/travis/env-windows.sh
index 0ea1f726..7ae6ea25 100644
--- a/other/travis/env-windows.sh
+++ b/other/travis/env-windows.sh
@@ -4,13 +4,12 @@ CMAKE=$ARCH-w64-mingw32.shared-cmake
4CMAKE_EXTRA_FLAGS="$CMAKE_EXTRA_FLAGS -DBOOTSTRAP_DAEMON=OFF -DCOMPILE_AS_CXX=ON" 4CMAKE_EXTRA_FLAGS="$CMAKE_EXTRA_FLAGS -DBOOTSTRAP_DAEMON=OFF -DCOMPILE_AS_CXX=ON"
5NPROC=`nproc` 5NPROC=`nproc`
6CURDIR=/work 6CURDIR=/work
7RUN_TESTS=false
7 8
8RUN() { 9RUN() {
9 ./dockcross "$@" 10 ./dockcross "$@"
10} 11}
11 12
12ENABLE_WINDOWS_TESTS=false
13
14TESTS() { 13TESTS() {
15 # Download Microsoft DLLs. 14 # Download Microsoft DLLs.
16 curl http://www.dlldump.com/dllfiles/I/iphlpapi.dll -o _build/iphlpapi.dll 15 curl http://www.dlldump.com/dllfiles/I/iphlpapi.dll -o _build/iphlpapi.dll
@@ -20,10 +19,8 @@ TESTS() {
20 ./dockcross sh -c 'cp $WINEDLLPATH/*.dll _build' 19 ./dockcross sh -c 'cp $WINEDLLPATH/*.dll _build'
21 20
22 # Run tests in docker. 21 # Run tests in docker.
23 if $ENABLE_WINDOWS_TESTS; then 22 ./dockcross "$@" || {
24 ./dockcross "$@" || { 23 cat _build/Testing/Temporary/LastTest.log
25 cat _build/Testing/Temporary/LastTest.log 24 false
26 false 25 }
27 }
28 fi
29} 26}