Fixup test execution

z4kn4fein · Dec 13, 2023 · bddcfdc · bddcfdc
1 parent 240133e
commit bddcfdc
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 12 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -9,7 +9,7 @@ jobs:
         build: [Debug, Release]
         os: [macos-latest, ubuntu-latest]
         compiler: [g++, clang++]
-        flags: [-std=c++17, -std=c++2a]
+        flags: [-std=c++17, -std=c++20]
     name: ${{matrix.os}} ${{matrix.compiler}} ${{matrix.build}} ${{matrix.flags}}
     env:
       CXX: ${{ matrix.compiler }}

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -15,14 +15,6 @@ file(GLOB test-sources CONFIGURE_DEPENDS *.cpp)
 
 include(Catch)
 
-# add c++17 tests
-add_executable(${PROJECT_NAME}-tests-17 "${test-sources}")
-set_target_properties(${PROJECT_NAME}-tests-17 PROPERTIES CXX_STANDARD 17)
-target_link_libraries(${PROJECT_NAME}-tests-17 PRIVATE Catch2::Catch2WithMain ${PROJECT_NAME})
-catch_discover_tests(${PROJECT_NAME}-tests-17)
-
-# add c++17 tests
-add_executable(${PROJECT_NAME}-tests-20 "${test-sources}")
-set_target_properties(${PROJECT_NAME}-tests-20 PROPERTIES CXX_STANDARD 20)
-target_link_libraries(${PROJECT_NAME}-tests-20 PRIVATE Catch2::Catch2WithMain ${PROJECT_NAME})
-catch_discover_tests(${PROJECT_NAME}-tests-20)
+add_executable(${PROJECT_NAME}-tests "${test-sources}")
+target_link_libraries(${PROJECT_NAME}-tests PRIVATE Catch2::Catch2WithMain ${PROJECT_NAME})
+catch_discover_tests(${PROJECT_NAME}-tests)