From 5f4a43084575bd0e7b4a172f0c5ad4314aca7a07 Mon Sep 17 00:00:00 2001 From: Benjamin Sergeant Date: Mon, 10 Jun 2019 22:01:19 -0700 Subject: [PATCH] disable building ws on windows on travis --- .travis.yml | 4 ++-- test/run.py | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 50a6ba31..b8f41616 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,6 +36,6 @@ matrix: - CMAKE_PATH="/c/Program Files/CMake/bin" script: - export PATH=$CMAKE_PATH:$PATH - - cmake -DUSE_TLS=1 -DUSE_WS=1 -DUSE_MBED_TLS=1 -DUSE_VENDORED_THIRD_PARTY=1 . - - cmake --build --parallel . + # - cmake -DUSE_TLS=1 -DUSE_WS=1 -DUSE_MBED_TLS=1 -DUSE_VENDORED_THIRD_PARTY=1 . + # - cmake --build --parallel . - python test/run.py diff --git a/test/run.py b/test/run.py index 6ce5dc24..8163fbb2 100755 --- a/test/run.py +++ b/test/run.py @@ -99,8 +99,10 @@ def runCMake(sanitizer, buildDir): #generator = '"NMake Makefiles"' #generator = '"Visual Studio 16 2019"' generator = '"Visual Studio 15 2017"' + USE_VENDORED_THIRD_PARTY = 'ON' else: generator = '"Unix Makefiles"' + USE_VENDORED_THIRD_PARTY = 'OFF' CMAKE_BUILD_TYPE = BUILD_TYPE @@ -110,6 +112,7 @@ def runCMake(sanitizer, buildDir): -DCMAKE_BUILD_TYPE={CMAKE_BUILD_TYPE} \ -DUSE_TLS=1 \ -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \ + -DUSE_VENDORED_THIRD_PARTY={USE_VENDORED_THIRD_PARTY} \ -G{generator}' cmakeCmd = fmt.format(**locals())