From 19a959dc313c03b48d2c1cf5737b737b202c84c8 Mon Sep 17 00:00:00 2001 From: Benjamin Sergeant Date: Sun, 23 Jun 2019 13:30:10 -0700 Subject: [PATCH] tweak CI + unittest --- test/CMakeLists.txt | 4 ++-- test/run.py | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index a4340a64..8565da9b 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -7,7 +7,7 @@ project (ixwebsocket_unittest) set (CMAKE_CXX_STANDARD 14) -if (NOT WIN32) +if (MAC) set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/../third_party/sanitizers-cmake/cmake" ${CMAKE_MODULE_PATH}) find_package(Sanitizers) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=thread") @@ -67,7 +67,7 @@ endif() add_executable(ixwebsocket_unittest ${SOURCES}) -if (NOT WIN32) +if (MAC) add_sanitizers(ixwebsocket_unittest) endif() diff --git a/test/run.py b/test/run.py index 8163fbb2..fd3887a9 100755 --- a/test/run.py +++ b/test/run.py @@ -102,7 +102,7 @@ def runCMake(sanitizer, buildDir): USE_VENDORED_THIRD_PARTY = 'ON' else: generator = '"Unix Makefiles"' - USE_VENDORED_THIRD_PARTY = 'OFF' + USE_VENDORED_THIRD_PARTY = 'ON' CMAKE_BUILD_TYPE = BUILD_TYPE @@ -111,6 +111,7 @@ def runCMake(sanitizer, buildDir): -B"{buildDir}" \ -DCMAKE_BUILD_TYPE={CMAKE_BUILD_TYPE} \ -DUSE_TLS=1 \ + -DUSE_MBED_TLS=1 \ -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \ -DUSE_VENDORED_THIRD_PARTY={USE_VENDORED_THIRD_PARTY} \ -G{generator}'