Cleaning up test logic

Author: gershnik

test/test.cmake

@@ -15,6 +15,16 @@ FetchContent_Declare(doctest
 
 FetchContent_MakeAvailable(doctest)
 
+if ("${CMAKE_CXX_COMPILER_FRONTEND_VARIANT}" STREQUAL "MSVC")
+    set(FRONT_MSVC True)
+else()
+    set(FRONT_MSVC False)
+endif()
+
+set (CLANG_CL "$<AND:$<BOOL:${FRONT_MSVC}>,$<CXX_COMPILER_ID:Clang>>")
+set (CLANG_NORMAL "$<AND:$<NOT:$<BOOL:${FRONT_MSVC}>>,$<CXX_COMPILER_ID:Clang>>")
+
+
 
 function(configure_test name)
 
@@ -37,29 +47,20 @@ function(configure_test name)
         PRIVATE
             $<$<CXX_COMPILER_ID:AppleClang>:-Wall -Wextra -Wpedantic 
                 -Wno-gnu-zero-variadic-macro-arguments #Clang bug - this is not an issue in C++20
+                -fprofile-instr-generate -fcoverage-mapping
             > 
-            $<$<CXX_COMPILER_ID:AppleClang>:-fprofile-instr-generate -fcoverage-mapping>
+            
+            $<${CLANG_NORMAL}:-Wall;-Wextra;-pedantic>
+            $<${CLANG_CL}:/W4;/WX>
 
             $<$<CXX_COMPILER_ID:GNU>:-Wall -Wextra -Wpedantic
                 -Wno-unknown-pragmas  #the whole point of pragmas it to be potentially unknown!
             >
-            $<$<CXX_COMPILER_ID:MSVC>:/utf-8
+            $<$<CXX_COMPILER_ID:MSVC>:/utf-8 /W4 /WX
                 /wd5285 #cannot declare a specialization for 'std::tuple' (in doctest)
             >
     )
 
-    if ("${CMAKE_CXX_COMPILER_FRONTEND_VARIANT}" STREQUAL "MSVC")
-        target_compile_options(${name}
-        PRIVATE
-            $<$<CXX_COMPILER_ID:Clang>:/W4;/WX>
-        )
-    else()
-        target_compile_options(${name}
-        PRIVATE
-            $<$<CXX_COMPILER_ID:Clang>:-Wall;-Wextra;-pedantic>
-        )
-    endif()
-
     target_link_options(${name}
     PRIVATE
         $<$<CXX_COMPILER_ID:AppleClang>:-fprofile-instr-generate -fcoverage-mapping>
@@ -99,7 +100,7 @@ endfunction(configure_test name)
 
 
 
-add_executable(test_normal)
+add_executable(test_normal EXCLUDE_FROM_ALL)
 configure_test(test_normal)
 
 target_compile_options(test_normal
@@ -131,25 +132,14 @@ target_compile_definitions(test_nothrow
 target_compile_options(test_nothrow
     PRIVATE
         $<$<CXX_COMPILER_ID:AppleClang>:-fno-exceptions -fno-rtti>
+        $<${CLANG_NORMAL}:-fno-exceptions -fno-rtti>
+        $<${CLANG_CL}:/GR- -D_HAS_EXCEPTIONS=0>
         $<$<CXX_COMPILER_ID:GNU>:-fno-exceptions -fno-rtti>
         $<$<CXX_COMPILER_ID:MSVC>:/GR- -D_HAS_EXCEPTIONS=0>
 )
 
-if ("${CMAKE_CXX_COMPILER_FRONTEND_VARIANT}" STREQUAL "MSVC")
-    target_compile_options(test_nothrow
-    PRIVATE
-        $<$<CXX_COMPILER_ID:Clang>:/GR- -D_HAS_EXCEPTIONS=0>
-    )
-else()
-    target_compile_options(test_nothrow
-    PRIVATE
-        $<$<CXX_COMPILER_ID:Clang>:-fno-exceptions -fno-rtti>
-    )
-endif()
-
-add_custom_target(tests
+add_custom_target(tests ALL
     DEPENDS test_normal test_expected test_nothrow
-    ${TEST_COMMAND}
 )
 
 if (${CMAKE_SYSTEM_NAME} STREQUAL Android)
@@ -164,6 +154,13 @@ if (${CMAKE_SYSTEM_NAME} STREQUAL Android)
     endif()
 endif()
 
+set(TEST_DATA_FILES 
+    ${CMAKE_CURRENT_LIST_DIR}/response.txt
+    ${CMAKE_CURRENT_LIST_DIR}/response1.txt
+    ${CMAKE_CURRENT_LIST_DIR}/response-recursive.txt
+    ${CMAKE_CURRENT_LIST_DIR}/response-recursive1.txt
+)
+
 set(TEST_SRCIPT 
 "
 cmake_path(GET EXECUTABLE FILENAME exefilename)
@@ -174,24 +171,19 @@ endmacro()
 ")
 
 if (${CMAKE_SYSTEM_NAME} STREQUAL Android)
-    set(ANDROID_ARTIFACTS 
-
-        ${CMAKE_CURRENT_LIST_DIR}/response.txt
-        ${CMAKE_CURRENT_LIST_DIR}/response1.txt
-        ${CMAKE_CURRENT_LIST_DIR}/response-recursive.txt
-        ${CMAKE_CURRENT_LIST_DIR}/response-recursive1.txt
-    )
-
     string(APPEND TEST_SRCIPT "
 run(${ADB} shell mkdir -p ${ANDROID_TEST_DIR}/data)
 run(${ADB} push \${EXECUTABLE} ${ANDROID_TEST_DIR})
 ")
 
-    foreach(artifact ${ANDROID_ARTIFACTS})
+    foreach(artifact ${TEST_DATA_FILES})
         string(APPEND TEST_SRCIPT "run(${ADB} push ${artifact} ${ANDROID_TEST_DIR}/data)\n")
     endforeach()
 
-    string(APPEND TEST_SRCIPT "run(${ADB} shell \"cd ${ANDROID_TEST_DIR} && LD_LIBRARY_PATH=${ANDROID_LD_LIBRARY_PATH} ./\${exefilename} -ni -fc\")\n")
+    string(APPEND TEST_SRCIPT "
+run(${ADB} shell \"cd ${ANDROID_TEST_DIR} && LD_LIBRARY_PATH=${ANDROID_LD_LIBRARY_PATH} ./\${exefilename} -ni -fc\")
+")
+
 elseif(CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
     string(APPEND TEST_SRCIPT "
 run(${CMAKE_COMMAND} -E env LLVM_PROFILE_FILE=${CMAKE_CURRENT_BINARY_DIR}/coverage/\${exefilename}.profraw \${EXECUTABLE} -ni -fc)