Only build and run tests in variant=coverage

CMakeLists.txt

@@ -102,16 +102,21 @@ endfunction()
 #-------------------------------------------------------------------------------
 
 if ("${VARIANT}" STREQUAL "coverage")
-    set(CMAKE_CXX_FLAGS
+    if (MSVC)
-      "${CMAKE_CXX_FLAGS} -fprofile-arcs -ftest-coverage")
+    else()
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fprofile-arcs -ftest-coverage")
         set (CMAKE_BUILD_TYPE RELWITHDEBINFO)
         set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lgcov")
+    endif()
 
 elseif ("${VARIANT}" STREQUAL "ubasan")
+    if (MSVC)
+    else()
         set(CMAKE_CXX_FLAGS
           "${CMAKE_CXX_FLAGS} -DBEAST_NO_SLOW_TESTS=1 -funsigned-char -fno-omit-frame-pointer -fsanitize=address,undefined -fsanitize-blacklist=${PROJECT_SOURCE_DIR}/scripts/blacklist.supp")
         set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=address,undefined")
         set(CMAKE_BUILD_TYPE RELWITHDEBINFO)
+    endif()
 
 elseif ("${VARIANT}" STREQUAL "debug")
     set(CMAKE_BUILD_TYPE DEBUG)
@@ -186,5 +191,8 @@ file(GLOB_RECURSE SERVER_INCLUDES
   )
 
 add_subdirectory (test)
+if (NOT "${VARIANT}" STREQUAL "coverage")
     add_subdirectory (example)
+endif()
+
 

Jamroot

@@ -52,8 +52,7 @@ if [ os.name ] = MACOSX
   using clang : : ;
 }
 
-variant coverage
+variant coverage :
-  :
     release
     :
     <cxxflags>"-fprofile-arcs -ftest-coverage"
@@ -64,7 +63,7 @@ variant ubasan
   :
     release
   :
-    <cxxflags>"-DBEAST_NO_SLOW_TESTS=1 -funsigned-char -fno-omit-frame-pointer -fsanitize=address,undefined -fsanitize-blacklist=scripts/blacklist.supp"
+    <cxxflags>"-funsigned-char -fno-omit-frame-pointer -fsanitize=address,undefined -fsanitize-blacklist=scripts/blacklist.supp"
     <linkflags>"-fsanitize=address,undefined"
   ;
 
@@ -112,4 +111,4 @@ project beast
   ;
 
 build-project test ;
-build-project example ;
+#build-project example ;

example/echo-op/Jamfile

@@ -5,6 +5,8 @@
 # file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 #
 
-exe echo-op/echo-op :
+exe echo-op :
     echo_op.cpp
+    :
+    <variant>coverage:<build>no
     ;

example/http-client-ssl/Jamfile

@@ -43,7 +43,8 @@ project
     <library>crypto
   ;
 
-exe http-client-ssl
+exe http-client-ssl :
-  :
     http_client_ssl.cpp
+    :
+    <variant>coverage:<build>no
     ;

example/http-client/Jamfile

@@ -7,4 +7,6 @@
 
 exe http-client :
     http_client.cpp
+    :
+    <variant>coverage:<build>no
     ;

example/http-crawl/Jamfile

@@ -8,4 +8,6 @@
 exe http-crawl :
     http_crawl.cpp
     urls_large_data.cpp
+    :
+    <variant>coverage:<build>no
     ;

example/server-framework/Jamfile

@@ -7,4 +7,6 @@
 
 exe server-framework :
     main.cpp
+    :
+    <variant>coverage:<build>no
     ;

example/websocket-client-ssl/Jamfile

@@ -43,7 +43,8 @@ project
     <library>crypto
   ;
 
-exe ssl-websocket-client
+exe ssl-websocket-client :
-  :
     ssl_websocket_client.cpp
+    :
+    <variant>coverage:<build>no
     ;

example/websocket-client/Jamfile

@@ -7,4 +7,6 @@
 
 exe websocket-client :
     websocket_client.cpp
+    :
+    <variant>coverage:<build>no
     ;

test/CMakeLists.txt

@@ -6,6 +6,7 @@ add_subdirectory (server)
 add_subdirectory (websocket)
 add_subdirectory (zlib)
 
+if (NOT "${VARIANT}" STREQUAL "coverage")
     GroupSources(extras/beast extras)
     GroupSources(include/beast beast)
     GroupSources(test "/")
@@ -27,3 +28,4 @@ target_link_libraries(lib-tests Beast ${Boost_PROGRAM_OPTIONS_LIBRARY})
     if (MINGW)
         set_target_properties(lib-tests PROPERTIES COMPILE_FLAGS "-Wa,-mbig-obj")
     endif()
+endif()

test/Jamfile

@@ -7,12 +7,12 @@
 
 import os ;
 
-compile config.cpp : : ;
+compile config.cpp :    <variant>coverage:<build>no : ;
-compile core.cpp : : ;
+compile core.cpp :      <variant>coverage:<build>no : ;
-compile http.cpp : : ;
+compile http.cpp :      <variant>coverage:<build>no : ;
-compile version.cpp : : ;
+compile version.cpp :   <variant>coverage:<build>no : ;
-compile websocket.cpp : : ;
+compile websocket.cpp : <variant>coverage:<build>no : ;
-compile zlib.cpp : : ;
+compile zlib.cpp :      <variant>coverage:<build>no : ;
 
 build-project core ;
 build-project http ;

test/http/CMakeLists.txt

@@ -44,6 +44,7 @@ target_link_libraries(http-tests
     ${Boost_CONTEXT_LIBRARY}
     )
 
+if (NOT "${VARIANT}" STREQUAL "coverage")
     add_executable (http-bench
         ${BEAST_INCLUDES}
         ${EXTRAS_INCLUDES}
@@ -59,3 +60,4 @@ target_link_libraries(http-bench
         ${Boost_PROGRAM_OPTIONS_LIBRARY}
         ${Boost_FILESYSTEM_LIBRARY}
         )
+endif()

test/server/CMakeLists.txt

@@ -1,5 +1,7 @@
 # Part of Beast
 
+if (NOT "${VARIANT}" STREQUAL "coverage")
+
     GroupSources(example/server-framework framework)
     GroupSources(extras/beast extras)
     GroupSources(include/beast beast)
@@ -44,3 +46,5 @@ target_link_libraries(server-test
     if (OPENSSL_FOUND)
       target_link_libraries(server-test ${OPENSSL_LIBRARIES})
     endif()
+
+endif()