boostorg/beast
1
0
Fork 1
mirror of https://github.com/boostorg/beast.git synced 2025-08-03 23:04:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

Only run the tests under ubasan

Browse Source
This commit is contained in:
Vinnie Falco
2017-06-20 16:56:28 -07:00
parent 7b8149cfd4
commit 3ff585d36e
4 changed files with 64 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@@ -191,8 +191,8 @@ file(GLOB_RECURSE SERVER_INCLUDES
) )
add_subdirectory (test) add_subdirectory (test)
if (NOT "${VARIANT}" STREQUAL "coverage")
if ((NOT "${VARIANT}" STREQUAL "coverage") AND
(NOT "${VARIANT}" STREQUAL "ubasan"))
add_subdirectory (example) add_subdirectory (example)
endif() endif()

9
test/CMakeLists.txt
View File

@@ -1,13 +1,16 @@
# Part of Beast # Part of Beast
add_subdirectory (benchmarks)
add_subdirectory (core) add_subdirectory (core)
add_subdirectory (http) add_subdirectory (http)
add_subdirectory (server)
add_subdirectory (websocket) add_subdirectory (websocket)
add_subdirectory (zlib) add_subdirectory (zlib)
if (NOT "${VARIANT}" STREQUAL "coverage") if ((NOT "${VARIANT}" STREQUAL "coverage") AND
(NOT "${VARIANT}" STREQUAL "ubasan"))
add_subdirectory (benchmarks)
add_subdirectory (server)
GroupSources(extras/beast extras) GroupSources(extras/beast extras)
GroupSources(include/beast beast) GroupSources(include/beast beast)
GroupSources(test "/") GroupSources(test "/")

18
test/benchmarks/CMakeLists.txt
View File

@@ -1,13 +1,11 @@
# Part of Beast # Part of Beast
if (NOT "${VARIANT}" STREQUAL "coverage") GroupSources(extras/beast extras)
GroupSources(include/beast beast)
GroupSources(test/benchmarks "/")
GroupSources(test/http "/")
GroupSources(extras/beast extras) add_executable (benchmarks
GroupSources(include/beast beast)
GroupSources(test/benchmarks "/")
GroupSources(test/http "/")
add_executable (benchmarks
${BEAST_INCLUDES} ${BEAST_INCLUDES}
${EXTRAS_INCLUDES} ${EXTRAS_INCLUDES}
../../extras/beast/unit_test/main.cpp ../../extras/beast/unit_test/main.cpp
@@ -16,12 +14,10 @@ if (NOT "${VARIANT}" STREQUAL "coverage")
buffers.cpp buffers.cpp
nodejs_parser.cpp nodejs_parser.cpp
parser.cpp parser.cpp
) )
target_link_libraries(benchmarks target_link_libraries(benchmarks
Beast Beast
${Boost_PROGRAM_OPTIONS_LIBRARY} ${Boost_PROGRAM_OPTIONS_LIBRARY}
${Boost_FILESYSTEM_LIBRARY} ${Boost_FILESYSTEM_LIBRARY}
) )
endif()

24
test/server/CMakeLists.txt
View File

@@ -1,18 +1,16 @@
# Part of Beast # Part of Beast
if (NOT "${VARIANT}" STREQUAL "coverage") GroupSources(example/server-framework framework)
GroupSources(extras/beast extras)
GroupSources(include/beast beast)
GroupSources(example/server-framework framework) GroupSources(test/server "/")
GroupSources(extras/beast extras)
GroupSources(include/beast beast)
GroupSources(test/server "/") if (OPENSSL_FOUND)
if (OPENSSL_FOUND)
include_directories(${OPENSSL_INCLUDE_DIR}) include_directories(${OPENSSL_INCLUDE_DIR})
endif() endif()
add_executable (server-test add_executable (server-test
${BEAST_INCLUDES} ${BEAST_INCLUDES}
${SERVER_INCLUDES} ${SERVER_INCLUDES}
../../extras/beast/unit_test/main.cpp ../../extras/beast/unit_test/main.cpp
@@ -35,16 +33,14 @@ if (NOT "${VARIANT}" STREQUAL "coverage")
ws_sync_port.cpp ws_sync_port.cpp
ws_upgrade_service.cpp ws_upgrade_service.cpp
wss_ports.cpp wss_ports.cpp
) )
target_link_libraries(server-test target_link_libraries(server-test
Beast Beast
${Boost_PROGRAM_OPTIONS_LIBRARY} ${Boost_PROGRAM_OPTIONS_LIBRARY}
${Boost_FILESYSTEM_LIBRARY} ${Boost_FILESYSTEM_LIBRARY}
) )
if (OPENSSL_FOUND) if (OPENSSL_FOUND)
target_link_libraries(server-test ${OPENSSL_LIBRARIES}) target_link_libraries(server-test ${OPENSSL_LIBRARIES})
endif()
endif() endif()