different tests for different standard versions

Author: dk949

CMakeLists.txt

@@ -26,7 +26,6 @@ if (PROJECT_IS_TOP_LEVEL)
             endif ()
         endif ()
 
-        set(CMAKE_CXX_STANDARD 20)
         set(CMAKE_CXX_EXTENSIONS OFF)
         set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
         add_subdirectory(tests)

include/demangle/include/ut/demangle

@@ -1,16 +1,22 @@
 include(compiler_warnings.cmake)
+find_package(Catch2 3 REQUIRED)
+include(CTest)
+include(Catch)
 
-set(TEST_FILES
+set(cxx_17_files
     ${CMAKE_CURRENT_SOURCE_DIR}/add_noexcept.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/change_observer.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/check.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/constexpr_hash.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/copy_traits.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/defer.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/pack_loops.cpp
+)
+set(cxx_20_files
+    ${cxx_17_files}
+    ${CMAKE_CURRENT_SOURCE_DIR}/change_observer.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/copy_traits.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/demangle.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/mt_queue.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/ownptrvec.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/pack_loops.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/pair.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/ptrvecview.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/resource.cpp
@@ -19,23 +25,35 @@ set(TEST_FILES
     ${CMAKE_CURRENT_SOURCE_DIR}/template_helpers.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/trim.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/valueptr.cpp
+)
+
+set(cxx_23_files
+    ${cxx_20_files}
     ${CMAKE_CURRENT_SOURCE_DIR}/err.cpp
 )
-add_executable(libut_tests ${TEST_FILES})
-target_link_libraries(libut_tests PRIVATE UT::all)
-set_target_warnings(libut_tests)
 
-find_package(Catch2 3 REQUIRED)
-target_link_libraries(libut_tests PRIVATE Catch2::Catch2WithMain)
-target_precompile_headers(libut_tests PRIVATE <catch.hpp>)
+function(setup_target target)
+    target_link_libraries(${target} PRIVATE UT::all)
+    set_target_warnings(${target})
+    target_link_libraries(${target} PRIVATE Catch2::Catch2WithMain)
+    target_precompile_headers(${target} PRIVATE <catch.hpp>)
+    if(NOT MSVC)
+        target_compile_options(${target} PUBLIC "-fsanitize=address" "-Og" "-g")
+        target_link_options(${target} PUBLIC "-fsanitize=address" "-lg")
+    else()
+        target_compile_options(${target} PUBLIC "/Zc:__cplusplus")
+    endif()
+    catch_discover_tests(${target})
+endfunction()
 
-if(NOT MSVC)
-    target_compile_options(libut_tests PUBLIC "-fsanitize=address" "-Og" "-g")
-    target_link_options(libut_tests PUBLIC "-fsanitize=address" "-lg")
-else()
-    target_compile_options(libut_tests PUBLIC "/Zc:__cplusplus")
-endif()
+add_executable(libut_tests_17 ${cxx_17_files})
+add_executable(libut_tests_20 ${cxx_20_files})
+add_executable(libut_tests_23 ${cxx_23_files})
 
-include(CTest)
-include(Catch)
-catch_discover_tests(libut_tests)
+target_compile_features(libut_tests_17 PUBLIC cxx_std_17)
+target_compile_features(libut_tests_20 PUBLIC cxx_std_20)
+target_compile_features(libut_tests_23 PUBLIC cxx_std_23)
+
+setup_target(libut_tests_17)
+setup_target(libut_tests_20)
+setup_target(libut_tests_23)

tests/CMakeLists.txt

@@ -7,6 +7,11 @@
 #include <string_view>
 #include <vector>
 
+bool startsWith(std::string_view str, std::string_view with) {
+    if (str.size() < with.size()) return false;
+    return str.substr(0, with.size()) == with;
+}
+
 #define DFLT_CTOR(name) \
     name() noexcept { }
 #define DTOR(name) \
@@ -156,13 +161,13 @@ TEST_CASE("Check functionality", "[check]") {
 
 
     REQUIRE(vec.size() == 8);
-    // Using starts_with (instead of ==) because Check uses typeid name to identify objects
-    REQUIRE(vec.at(0).starts_with("Check();"));
-    REQUIRE(vec.at(1).starts_with("Check(const Check &);"));
-    REQUIRE(vec.at(2).starts_with("Check(Check &&);"));
-    REQUIRE(vec.at(3).starts_with("Check &operator=(Check);"));
-    REQUIRE(vec.at(4).starts_with("Check &operator=(Check &&);"));
-    REQUIRE(vec.at(5).starts_with("~Check();"));
-    REQUIRE(vec.at(6).starts_with("~Check();"));
-    REQUIRE(vec.at(7).starts_with("~Check();"));
+    // Using startsWith (instead of ==) because Check uses typeid name to identify objects
+    REQUIRE(startsWith(vec.at(0), "Check();"));
+    REQUIRE(startsWith(vec.at(1), "Check(const Check &);"));
+    REQUIRE(startsWith(vec.at(2), "Check(Check &&);"));
+    REQUIRE(startsWith(vec.at(3), "Check &operator=(Check);"));
+    REQUIRE(startsWith(vec.at(4), "Check &operator=(Check &&);"));
+    REQUIRE(startsWith(vec.at(5), "~Check();"));
+    REQUIRE(startsWith(vec.at(6), "~Check();"));
+    REQUIRE(startsWith(vec.at(7), "~Check();"));
 }

tests/check.cpp

@@ -20,10 +20,16 @@ constexpr auto len(char const *str) {
     return std::char_traits<char>::length(str);
 }
 
+constexpr char *copy(char *to, char const *from, std::size_t size) {
+    for (auto i = size_t(0); i < size; ++i)
+        to[i] = from[i];
+    return to;
+}
+
 template<std::size_t size>
 constexpr auto makeCopy(char const *str) {
     std::array<char, size + 1> arr {};
-    std::char_traits<char>::copy(arr.data(), str, arr.size());
+    copy(arr.data(), str, arr.size());
     arr[size] = 0;
     return arr;
 }

tests/constexpr_hash.cpp

@@ -67,6 +67,8 @@ void loopOverParameterPackContinue() {
     REQUIRE(count == 4);
 }
 
+#if __cplusplus >= 202'002
+
 template<typename... Ts>
 void loopOverTypes() {
     int count = 0;
@@ -113,6 +115,8 @@ void loopOverTypesContinue() {
     REQUIRE(float_count == 2);
 }
 
+#endif
+
 template<typename... T>
 int indexArgs(T... args) {
     return UT_PACK_IDX(args, 2);
@@ -138,11 +142,13 @@ TEST_CASE("pack for loop", "[pack_loops]") {
     loopOverParameterPackContinue<0, -100, 1, -100, 2, -100, 3>();
 }
 
+#if __cplusplus >= 202'002
 TEST_CASE("type pack for loop", "[pack_loops]") {
     loopOverTypes<int, float, double, float>();
     loopOverTypesBreak<int, float, float, double, float, int>();
     loopOverTypesContinue<int, float, double, float, int>();
 }
+#endif
 
 TEST_CASE("pack index", "[pack_loops]") {
     REQUIRE(indexArgs(0, 0, 3, 0) == 3);