Feature/windows ci (#76)
* close with params * ... * different generator * core size = 1 * disable more tests to get something working on windows * try to enable another test on windows * enable all OS * set proper version of linux * another try * try again with just env variables * Revert "core size = 1" This reverts commit29af74bba6
. * add windows and mac * Revert "close with params" This reverts commit6bb00b6788
.
This commit is contained in:
@ -31,20 +31,21 @@ set (SOURCES
|
||||
../third_party/msgpack11/msgpack11.cpp
|
||||
../ws/ixcore/utils/IXCoreLogger.cpp
|
||||
|
||||
IXDNSLookupTest.cpp
|
||||
IXSocketTest.cpp
|
||||
IXSocketConnectTest.cpp
|
||||
IXWebSocketServerTest.cpp
|
||||
IXWebSocketPingTest.cpp
|
||||
IXWebSocketTestConnectionDisconnection.cpp
|
||||
IXUrlParserTest.cpp
|
||||
IXWebSocketMessageQTest.cpp
|
||||
IXWebSocketServerTest.cpp
|
||||
)
|
||||
|
||||
# Some unittest don't work on windows yet
|
||||
if (NOT WIN32)
|
||||
if (UNIX)
|
||||
list(APPEND SOURCES
|
||||
IXWebSocketPingTimeoutTest.cpp
|
||||
IXDNSLookupTest.cpp
|
||||
IXWebSocketPingTest.cpp
|
||||
cmd_websocket_chat.cpp
|
||||
)
|
||||
endif()
|
||||
|
@ -103,7 +103,8 @@ def runCMake(sanitizer, buildDir):
|
||||
|
||||
if platform.system() == 'Windows':
|
||||
#generator = '"NMake Makefiles"'
|
||||
generator = '"Visual Studio 16 2019"'
|
||||
#generator = '"Visual Studio 16 2019"'
|
||||
generator = '"Visual Studio 15 2017"'
|
||||
else:
|
||||
generator = '"Unix Makefiles"'
|
||||
|
||||
|
Reference in New Issue
Block a user