use ctest to simplify command line and working-directory

#1
feelpp · Jul 8, 2023 · 11d54b0 · 11d54b0
1 parent 4e5f29f
commit 11d54b0
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 27 deletions.
diff --git a/.github/workflows/pull_request_test.yml b/.github/workflows/pull_request_test.yml
@@ -34,12 +34,14 @@ jobs:
         mkdir build && cd build
         cmake -DCMAKE_BUILD_TYPE=Release -DEIGENRAND_CXX_FLAGS="-${{ matrix.arch }} -I${EIGEN_PATH}" ../
         make
-    - name: Test
+    - name: Tests
       run: |
-        ./build/test/EigenRand-test
-    - name: Run Accuracy
+        ctest -R test
+      working-directory: build
+    - name: Accuracy
       run: |
-        ./build/EigenRand-accuracy
+        ctest -R accuracy
+      working-directory: build
 
   build_linux_avx512:
     name: Build for linux AVX512
@@ -68,12 +70,14 @@ jobs:
         mkdir build && cd build
         cmake -DCMAKE_BUILD_TYPE=Release -DEIGENRAND_CXX_FLAGS="-${{ matrix.arch }} -mavx512f -mfma -I${EIGEN_PATH}" ../
         make
-    - name: Test
+    - name: Tests
       run: |
-        ./build/test/EigenRand-test
-    - name: Run Accuracy
+        ctest -R test
+      working-directory: build
+    - name: Accuracy
       run: |
-        ./build/EigenRand-accuracy
+        ctest -R accuracy
+      working-directory: build
 
   build_macos:
     name: Build for macOS
@@ -100,12 +104,14 @@ jobs:
         mkdir build && cd build
         cmake -DCMAKE_BUILD_TYPE=Release -DEIGENRAND_CXX_FLAGS="-${{ matrix.arch }} -I${EIGEN_PATH}" ../
         make
-    - name: Test
+    - name: Tests
       run: |
-        ./build/test/EigenRand-test
-    - name: Run Accuracy
+        ctest -R test
+      working-directory: build
+    - name: Accuracy
       run: |
-        ./build/EigenRand-accuracy
+        ctest -R accuracy
+      working-directory: build
 
   build_windows:
     name: Build for Windows
@@ -136,12 +142,14 @@ jobs:
         cmakeAppendedArgs: -G"Visual Studio 16 2019" -Ax64 -DEIGENRAND_CXX_FLAGS="${{ matrix.arch }} /I${{ env.EIGEN_PATH }}"
         buildWithCMakeArgs: --config Release
         buildDirectory: build
-    - name: Test
+    - name: Tests
       run: |
-        .\build\test\Release\EigenRand-test.exe
-    - name: Run Accuracy
+        ctest -R test
+      working-directory: build
+    - name: Accuracy
       run: |
-        .\build\Release\EigenRand-accuracy.exe
+        ctest -R accuracy
+      working-directory: build
 
   build_windows_avx512:
     name: Build for Windows
@@ -171,12 +179,14 @@ jobs:
         cmakeAppendedArgs: -G"Visual Studio 16 2019" -Ax64 -DEIGENRAND_CXX_FLAGS="${{ matrix.arch }} /I${{ env.EIGEN_PATH }}"
         buildWithCMakeArgs: --config Release
         buildDirectory: build
-    - name: Test
+    - name: Tests
       run: |
-        .\build\test\Release\EigenRand-test.exe
-    - name: Run Accuracy
+        ctest -R test
+      working-directory: build
+    - name: Accuracy
       run: |
-        .\build\Release\EigenRand-accuracy.exe
+        ctest -R accuracy
+      working-directory: build
 
   reference:
     name: Reference

diff --git a/.github/workflows/pull_request_test_non_x64.yml b/.github/workflows/pull_request_test_non_x64.yml
@@ -70,5 +70,5 @@ jobs:
           mkdir build && cd build
           cmake -DCMAKE_BUILD_TYPE=Release -DEIGENRAND_CXX_FLAGS="-${{ matrix.arch }} -I${EIGEN_PATH}" ../
           make
-          ./test/EigenRand-test
-          ./EigenRand-accuracy 256
+          ctest -R test
+          ctest -R accuracy
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -105,11 +105,10 @@ set(ITEMS
 )
 foreach(app ${ITEMS})
   get_filename_component(app_name ${app} NAME_WE)
-  string(TOLOWER ${app_name} app_name_lower)
-#  string(TOLOWER ${PROJECT_NAME} project_name_lower)
-  add_executable(${project_name}-${app_name_lower} ${app})
-  target_link_libraries(${project_name}-${app_name_lower} PRIVATE eigenrand)
-  install(TARGETS ${project_name}-${app_name_lower} DESTINATION bin)
+  add_executable(${PROJECT_NAME}-${app_name} ${app})
+  target_link_libraries(${PROJECT_NAME}-${app_name} PRIVATE eigenrand)
+  install(TARGETS ${PROJECT_NAME}-${app_name} DESTINATION bin)
+  add_test(NAME ${PROJECT_NAME}-${app_name} COMMAND ${PROJECT_NAME}-${app_name})
 endforeach()