Switching to ctest

gershnik · gershnik · commit 4e825008b2ec · 2026-06-13T12:19:59.000-07:00
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -174,10 +174,11 @@ jobs:
 
         if [[ '${{ matrix.os }}' == windows-* ]]; then
             if [[ '${{ matrix.compiler }}' != '' ]]; then
+                VSROOT=`"/c/Program Files (x86)/Microsoft Visual Studio/Installer/vswhere.exe" -latest -property installationPath`
                 if [[ '${{ matrix.arch }}' == "x64" ]]; then
-                    VCPREFIX="C:\\Program Files\\Microsoft Visual Studio\\2022\\Enterprise\\VC\\Tools\\Llvm\\x64\\bin"
+                    VCPREFIX="$VSROOT\\VC\\Tools\\Llvm\\x64\\bin"
                 else
-                    VCPREFIX="C:\\Program Files\\Microsoft Visual Studio\\2022\\Enterprise\\VC\\Tools\\Llvm\\bin"
+                    VCPREFIX="$VSROOT\\VC\\Tools\\Llvm\\bin"
                 fi
                 echo "CC=$VCPREFIX\\${{ matrix.compiler }}" >> $GITHUB_ENV
                 echo "CXX=$VCPREFIX\\${{ matrix.compiler }}" >> $GITHUB_ENV
@@ -206,9 +207,13 @@ jobs:
           fi
         fi
 
-    - name: Build and Test
+    - name: Build
       shell: bash
-      run: cmake --build out --config MinSizeRel --target run-test
+      run: cmake --build out --config MinSizeRel --target tests
+
+    - name: Test
+      shell: bash
+      run: ctest --test-dir out -C MinSizeRel --output-on-failure -VV 
 
   container:
     needs: define-matrix
@@ -232,12 +237,15 @@ jobs:
 
     - name: Configure
       shell: bash
-      run: |
-        cmake -GNinja -S . -B out -DCMAKE_BUILD_TYPE=MinSizeRel
+      run: cmake -GNinja -S . -B out -DCMAKE_BUILD_TYPE=MinSizeRel
+
+    - name: Build
+      shell: bash
+      run: cmake --build out --config MinSizeRel --target tests
 
-    - name: Build and Test
+    - name: Test
       shell: bash
-      run: cmake --build out --config MinSizeRel --target run-test
+      run: ctest --test-dir out -C MinSizeRel --output-on-failure -VV 
 
   gcc-10_2:
     runs-on: ubuntu-latest
@@ -265,9 +273,13 @@ jobs:
       run: |
         cmake -GNinja -S . -B out -DCMAKE_BUILD_TYPE=MinSizeRel
 
-    - name: Build and Test
+    - name: Build
+      shell: bash
+      run: cmake --build out --config MinSizeRel --target tests
+
+    - name: Test
       shell: bash
-      run: cmake --build out --config MinSizeRel --target run-test
+      run: ctest --test-dir out -C MinSizeRel --output-on-failure -VV 
 
 
   big-endian:
@@ -289,11 +301,17 @@ jobs:
         export QEMU_LD_PREFIX=/usr/powerpc-linux-gnu/
         cmake -S . -B out -DCMAKE_BUILD_TYPE=MinSizeRel -DCMAKE_SYSTEM_PROCESSOR=powerpc
 
-    - name: Build and Test
+    - name: Build
       shell: bash
       run: |
         export QEMU_LD_PREFIX=/usr/powerpc-linux-gnu/
-        cmake --build out --config MinSizeRel --target run-test
+        cmake --build out --config MinSizeRel --target tests
+
+    - name: Test
+      shell: bash
+      run: |
+        export QEMU_LD_PREFIX=/usr/powerpc-linux-gnu/
+        ctest --test-dir out -C MinSizeRel --output-on-failure -VV 
 
   android:
     runs-on: ubuntu-latest
@@ -349,8 +367,11 @@ jobs:
             echo "::group::Configure"
             cmake -S . -B out -DCMAKE_BUILD_TYPE:STRING=MinSizeRel -DCMAKE_TOOLCHAIN_FILE:FILEPATH=$ANDROID_SDK_ROOT/ndk/${{ matrix.version }}/build/cmake/android.toolchain.cmake -DANDROID_ABI:STRING=${{ matrix.arch }} -DANDROID_PLATFORM:STRING=${{ matrix.version }} -DANDROID_STL:STRING=c++_static
             echo "::endgroup::"
-            echo "::group::Build and Test"
-            cmake --build out --config MinSizeRel --target run-test
+            echo "::group::Build"
+            cmake --build out --config MinSizeRel --target tests
+            echo "::endgroup::"
+            echo "::group::Test"
+            ctest --test-dir out -C MinSizeRel --output-on-failure -VV 
             echo "::endgroup::"
 
   emscripten:
@@ -385,9 +406,13 @@ jobs:
       run: cmake -GNinja -S . -B out -DCMAKE_TOOLCHAIN_FILE=$EMSDK/upstream/emscripten/cmake/Modules/Platform/Emscripten.cmake -DCMAKE_BUILD_TYPE=MinSizeRel
 
 
-    - name: Build and Test
+    - name: Build
+      shell: bash
+      run: cmake --build out --config MinSizeRel --target tests
+
+    - name: Test
       shell: bash
-      run: cmake --build out --config MinSizeRel --target run-test
+      run: ctest --test-dir out -C MinSizeRel --output-on-failure -VV 
     
   pythons:
     runs-on: ubuntu-latest
@@ -410,14 +435,12 @@ jobs:
     
     - name: Configure
       shell: bash
-      run: |
-        cmake -S . -B out -DCMAKE_BUILD_TYPE=MinSizeRel
+      run: cmake -S . -B out -DCMAKE_BUILD_TYPE=MinSizeRel
 
-    - name: Build and Test
+    - name: Build
       shell: bash
-      run: |
-        cmake --build out --config MinSizeRel --target test-20python test-23python
-        echo Running test-20python
-        out/test/test-20python -ni -fc
-        echo Running test-23python
-        out/test/test-23python -ni -fc
+      run: cmake --build out --config MinSizeRel --target test-20python test-23python
+
+    - name: Test
+      shell: bash
+      run: ctest --test-dir out -C MinSizeRel --output-on-failure -VV -R '.*python'
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -26,45 +26,45 @@ if (PROJECT_IS_TOP_LEVEL)
     
     include(lib/cmake/install.cmake)
 
-endif()
-
-if(${Python3_Interpreter_FOUND} AND "${Python3_VERSION}" VERSION_GREATER_EQUAL "3.9")
-
-    file(GLOB UNICODE_DATA ${CMAKE_CURRENT_LIST_DIR}/unicode/data/*.txt)
-    file(GLOB UNICODE_SCRIPTS ${CMAKE_CURRENT_LIST_DIR}/unicode/scripts/*.py)
-
-    set(UNICODE_GENERATED_FILES
-        ${CMAKE_CURRENT_LIST_DIR}/lib/inc/sys_string/impl/unicode/mappings.h
-        ${CMAKE_CURRENT_LIST_DIR}/test/test_grapheme_data.h
-        ${CMAKE_CURRENT_LIST_DIR}/test/test_grapheme_data_15.h
-        ${CMAKE_CURRENT_LIST_DIR}/test/test_grapheme_data_16.h
-        ${CMAKE_CURRENT_LIST_DIR}/test/test_normalization_data.h
-    )
-
-    add_custom_command(
-        COMMENT "Generating Unicoode mappings"
-        OUTPUT ${UNICODE_GENERATED_FILES}
-        COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_LIST_DIR}/unicode/scripts/genmappings.py 
-                        ${CMAKE_CURRENT_LIST_DIR}/unicode/data 
-                        ${UNICODE_GENERATED_FILES}
-        DEPENDS 
-            ${UNICODE_DATA} 
+    if(${Python3_Interpreter_FOUND} AND "${Python3_VERSION}" VERSION_GREATER_EQUAL "3.9")
+
+        file(GLOB UNICODE_DATA ${CMAKE_CURRENT_LIST_DIR}/unicode/data/*.txt)
+        file(GLOB UNICODE_SCRIPTS ${CMAKE_CURRENT_LIST_DIR}/unicode/scripts/*.py)
+
+        set(UNICODE_GENERATED_FILES
+            ${CMAKE_CURRENT_LIST_DIR}/lib/inc/sys_string/impl/unicode/mappings.h
+            ${CMAKE_CURRENT_LIST_DIR}/test/test_grapheme_data.h
+            ${CMAKE_CURRENT_LIST_DIR}/test/test_grapheme_data_15.h
+            ${CMAKE_CURRENT_LIST_DIR}/test/test_grapheme_data_16.h
+            ${CMAKE_CURRENT_LIST_DIR}/test/test_normalization_data.h
+        )
+
+        add_custom_command(
+            COMMENT "Generating Unicoode mappings"
+            OUTPUT ${UNICODE_GENERATED_FILES}
+            COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_LIST_DIR}/unicode/scripts/genmappings.py 
+                            ${CMAKE_CURRENT_LIST_DIR}/unicode/data 
+                            ${UNICODE_GENERATED_FILES}
+            DEPENDS 
+                ${UNICODE_DATA} 
+                ${UNICODE_SCRIPTS}
+        )
+
+        add_custom_target(generate_unicode_mappings
+            DEPENDS 
+                ${UNICODE_GENERATED_FILES}
+        )
+
+        target_sources(generate_unicode_mappings
+        PRIVATE
             ${UNICODE_SCRIPTS}
-    )
-
-    add_custom_target(generate_unicode_mappings
-        DEPENDS 
-            ${UNICODE_GENERATED_FILES}
-    )
+        )
 
-    target_sources(generate_unicode_mappings
-    PRIVATE
-        ${UNICODE_SCRIPTS}
-    )
+        set_source_files_properties(${UNICODE_SCRIPTS} PROPERTIES XCODE_EXPLICIT_FILE_TYPE text.script.python)
 
-    set_source_files_properties(${UNICODE_SCRIPTS} PROPERTIES XCODE_EXPLICIT_FILE_TYPE text.script.python)
+        add_dependencies(sys_string generate_unicode_mappings)
 
-    add_dependencies(sys_string generate_unicode_mappings)
+    endif()
 
 endif()
 
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -145,9 +145,6 @@ set(STORAGE_FLAG_andr "")
 set(STORAGE_FLAG_unix_gen SYS_STRING_USE_GENERIC=1)
 set(STORAGE_FLAG_python SYS_STRING_USE_PYTHON=1)
 
-set(TEST_COMMAND "")
-set(TEST_DEPS "")
-
 if (${CMAKE_SYSTEM_NAME} STREQUAL Android)
     set(ANDROID_TEST_DIR /data/local/tmp/sys_string_test)
     set(ANDROID_SDK_DIR ${CMAKE_ANDROID_NDK}/../..)
@@ -159,9 +156,56 @@ if (${CMAKE_SYSTEM_NAME} STREQUAL Android)
         set(ANDROID_LD_LIBRARY_PATH /apex/com.android.art/lib64:/apex/com.android.runtime/lib64)
     endif()
 
-    list(APPEND TEST_COMMAND COMMAND ${ADB} shell mkdir -p ${ANDROID_TEST_DIR})
 endif()
 
+
+add_custom_target(tests ALL)
+
+set(TEST_SRCIPT 
+"
+cmake_path(GET EXECUTABLE FILENAME exefilename)
+
+macro(run)
+    execute_process(COMMAND \${ARGV} RESULT_VARIABLE CMD_RESULT)
+    if(CMD_RESULT)
+        message(FATAL_ERROR \"Error running \${ARGV}\")
+    endif()
+endmacro()
+")
+
+if (${CMAKE_SYSTEM_NAME} STREQUAL Android)
+    string(APPEND TEST_SRCIPT "
+run(${ADB} shell mkdir -p ${ANDROID_TEST_DIR})
+run(${ADB} push \${EXECUTABLE} ${ANDROID_TEST_DIR})
+run(${ADB} shell LD_LIBRARY_PATH=${ANDROID_LD_LIBRARY_PATH} ${ANDROID_TEST_DIR}/\${exefilename} -ni -fc)
+")
+elseif (DEFINED EMSCRIPTEN)
+    string(APPEND TEST_SRCIPT "
+run(${NODE_JS_EXECUTABLE} \${EXECUTABLE} -ni -fc)
+")
+elseif(SYS_STRING_COLLECT_COVERAGE AND ${CMAKE_SYSTEM_NAME} STREQUAL Darwin AND 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)
+run(xcrun llvm-profdata merge -sparse ${CMAKE_CURRENT_BINARY_DIR}/coverage/\${exefilename}.profraw -o ${CMAKE_CURRENT_BINARY_DIR}/coverage/\${exefilename}.profdata)
+run(xcrun llvm-cov show -format=html 
+            -Xdemangler=c++filt -Xdemangler -n
+            -show-regions=1
+            -show-instantiations=0
+            #-show-branches=count
+            #-show-instantiation-summary=1
+            -ignore-filename-regex=test/.\\*
+            -output-dir=${CMAKE_CURRENT_BINARY_DIR}/coverage/\${exefilename}
+            -instr-profile=${CMAKE_CURRENT_BINARY_DIR}/coverage/\${exefilename}.profdata 
+            \${EXECUTABLE})
+")
+else()
+    string(APPEND TEST_SRCIPT "
+run(\${EXECUTABLE} -ni -fc)
+")
+endif()
+
+file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/run-test.cmake ${TEST_SRCIPT})
+
 set(LIB_TYPES " ")
 if (ICU_FOUND AND ICU_UC_FOUND)
     list(APPEND LIB_TYPES _icu)
@@ -321,31 +365,16 @@ foreach(LIB_SUFFIX ${LIB_TYPES})
         "$<$<PLATFORM_ID:Linux>:test_linux.cpp>" 
         "$<$<PLATFORM_ID:Emscripten>:test_javascript.cpp>" 
     )
+    
 
-    list(APPEND TEST_COMMAND COMMAND echo "Running test-${TEST_SUFFIX}")
-    if (${CMAKE_SYSTEM_NAME} STREQUAL Android)
-        list(APPEND TEST_COMMAND COMMAND ${ADB} push test-${TEST_SUFFIX} ${ANDROID_TEST_DIR})
-        list(APPEND TEST_COMMAND COMMAND ${ADB} shell LD_LIBRARY_PATH=${ANDROID_LD_LIBRARY_PATH} ${ANDROID_TEST_DIR}/test-${TEST_SUFFIX} -ni)
-    elseif (DEFINED EMSCRIPTEN)
-        list(APPEND TEST_COMMAND COMMAND ${NODE_JS_EXECUTABLE} test-${TEST_SUFFIX} -ni)
-    elseif(SYS_STRING_COLLECT_COVERAGE AND ${CMAKE_SYSTEM_NAME} STREQUAL Darwin AND CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
-        list(APPEND TEST_COMMAND COMMAND ${CMAKE_COMMAND} -E env LLVM_PROFILE_FILE=${CMAKE_CURRENT_BINARY_DIR}/coverage/test-${TEST_SUFFIX}.profraw $<TARGET_FILE:test-${TEST_SUFFIX}>)
-        list(APPEND TEST_COMMAND COMMAND xcrun llvm-profdata merge -sparse ${CMAKE_CURRENT_BINARY_DIR}/coverage/test-${TEST_SUFFIX}.profraw -o ${CMAKE_CURRENT_BINARY_DIR}/coverage/test-${TEST_SUFFIX}.profdata)
-        list(APPEND TEST_COMMAND COMMAND xcrun llvm-cov show -format=html 
-                -Xdemangler=c++filt -Xdemangler -n
-                -show-regions=1
-                -show-instantiations=0
-                #-show-branches=count
-                #-show-instantiation-summary=1
-                -ignore-filename-regex=test/.\\*
-                -output-dir=${CMAKE_CURRENT_BINARY_DIR}/coverage/report-${TEST_SUFFIX}
-                -instr-profile=${CMAKE_CURRENT_BINARY_DIR}/coverage/test-${TEST_SUFFIX}.profdata 
-                $<TARGET_FILE:test-${TEST_SUFFIX}>)
-    else()
-        list(APPEND TEST_COMMAND COMMAND test-${TEST_SUFFIX} -ni)
-    endif()
+    add_dependencies(tests test-${TEST_SUFFIX})
 
-    list(APPEND TEST_DEPS test-${TEST_SUFFIX})
+    add_test(
+        NAME "test-${TEST_SUFFIX}"
+        COMMAND ${CMAKE_COMMAND} 
+            -DEXECUTABLE=$<TARGET_FILE:test-${TEST_SUFFIX}>
+            -P ${CMAKE_CURRENT_BINARY_DIR}/run-test.cmake
+    )
 
 endforeach()
 endforeach()
@@ -357,7 +386,3 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL Windows AND ${Python3_Development_FOUND} AND ${
     )
 endif()
 
-add_custom_target(run-test 
-    DEPENDS ${TEST_DEPS}
-    ${TEST_COMMAND}
-)
