From 491386a1273538a355c8aae3aa9a35a1447baf23 Mon Sep 17 00:00:00 2001 From: Martin Matuska Date: Wed, 27 Feb 2019 22:22:46 +0100 Subject: [PATCH] Travis CI Windows fixes - MS Visual Studio: use cmake's interface to build system - disable Windows tests (test only the build) due to timeout and fail issues --- build/ci/travis_ci.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/build/ci/travis_ci.sh b/build/ci/travis_ci.sh index 2373a5e2c..e51a67931 100755 --- a/build/ci/travis_ci.sh +++ b/build/ci/travis_ci.sh @@ -12,16 +12,17 @@ case "$UNAME" in MSYS*) if [ "${BS}" = "msbuild" ]; then set -x - export PATH=${PATH}:"/c/Program Files (x86)/Microsoft Visual Studio/2017/BuildTools/MSBuild/15.0/Bin" cmake -G "Visual Studio 15 2017" -D CMAKE_BUILD_TYPE="Release" "${SRCDIR}" - MSBuild.exe libarchive.sln //t:ALL_BUILD - MSBuild.exe libarchive.sln //t:RUN_ALL_TESTS + cmake --build . --target ALL_BUILD + # Until fixed, we don't run tests on Windows (lots of fails + timeout) + #cmake --build . --target RUN_TESTS set +x elif [ "${BS}" = "mingw" ]; then set -x cmake -G "MSYS Makefiles" -D CMAKE_C_COMPILER="${CC}" -D CMAKE_MAKE_PROGRAM="mingw32-make" -D CMAKE_BUILD_TYPE="Release" "${SRCDIR}" mingw32-make - mingw32-make test + # The MinGW tests time out on Travis CI, disable for now + #mingw32-make test set +x else echo "Unknown or unspecified build type: ${BS}" -- 2.47.2