Adapt sanitizer ignored test cases after renaming some tests

AIDASoft · Dec 12, 2023 · 46ebf51 · 46ebf51
1 parent c1f1c9d
commit 46ebf51
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 20 deletions.
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -51,8 +51,20 @@ macro(ADD_PODIO_LEGACY_TEST version base_test input_file)
   )
 endmacro()
 
+set(root_legacy_test_versions
+  v00-16
+  v00-16-02
+  v00-16-05
+  v00-16-06
+)
+
 add_subdirectory(root_io)
 if (ENABLE_SIO)
+  set(sio_legacy_test_versions
+    v00-16-05
+    v00-16-06
+  )
+
   add_subdirectory(sio_io)
 endif()
 add_subdirectory(unittests)

diff --git a/tests/CTestCustom.cmake b/tests/CTestCustom.cmake
@@ -30,15 +30,15 @@ if ((NOT "@FORCE_RUN_ALL_TESTS@" STREQUAL "ON") AND (NOT "@USE_SANITIZER@" STREQ
     pyunittest
 
     podio-dump-help
-    podio-dump-root-legacy
     podio-dump-root
     podio-dump-detailed-root
-    podio-dump-detailed-root-legacy
+    podio-dump-legacy_root_v00-16-06
+    podio-dump-legacy_root-detailed_v00-16-06
 
-    podio-dump-sio-legacy
     podio-dump-sio
     podio-dump-detailed-sio
-    podio-dump-detailed-sio-legacy
+    podio-dump-legacy_sio_v00-16-06
+    podio-dump-legacy_sio-detailed_v00-16-06
 
     datamodel_def_store_roundtrip_root
     datamodel_def_store_roundtrip_root_extension
@@ -49,11 +49,16 @@ if ((NOT "@FORCE_RUN_ALL_TESTS@" STREQUAL "ON") AND (NOT "@USE_SANITIZER@" STREQ
     read_new_data_root
   )
 
-  foreach(version in @legacy_test_versions@)
+  foreach(version in @root_legacy_test_versions@)
       list(APPEND CTEST_CUSTOM_TESTS_IGNORE read_frame_root_${version})
       list(APPEND CTEST_CUSTOM_TESTS_IGNORE read_frame_legacy_root_${version})
   endforeach()
 
+  foreach(version in @sio_legacy_test_versions@)
+      list(APPEND CTEST_CUSTOM_TESTS_IGNORE read_frame_sio_${version})
+      list(APPEND CTEST_CUSTOM_TESTS_IGNORE read_frame_legacy_sio_${version})
+  endforeach()
+
   # ostream_operator is working with Memory sanitizer (at least locally)
   if("@USE_SANITIZER@" MATCHES "Memory(WithOrigin)?")
     list(REMOVE_ITEM CTEST_CUSTOM_TESTS_IGNORE ostream_operator)

diff --git a/tests/root_io/CMakeLists.txt b/tests/root_io/CMakeLists.txt
@@ -36,14 +36,7 @@ endif()
 add_executable(read_frame_legacy_root read_frame_legacy_root.cpp)
 target_link_libraries(read_frame_legacy_root PRIVATE "${root_libs}")
 
-set(legacy_test_versions
-  v00-16
-  v00-16-02
-  v00-16-05
-  v00-16-06
-)
-
-foreach(version IN LISTS legacy_test_versions)
+foreach(version IN LISTS root_legacy_test_versions)
   ADD_PODIO_LEGACY_TEST(${version} read_frame_root ${version}-example_frame.root)
   ADD_PODIO_LEGACY_TEST(${version} read_frame_legacy_root ${version}-example.root)
 endforeach()

diff --git a/tests/sio_io/CMakeLists.txt b/tests/sio_io/CMakeLists.txt
@@ -27,13 +27,7 @@ set_property(TEST read_python_frame_sio PROPERTY DEPENDS write_python_frame_sio)
 add_executable(read_frame_legacy_sio read_frame_legacy_sio.cpp)
 target_link_libraries(read_frame_legacy_sio PRIVATE "${sio_libs}" TestDataModel)
 
-
-set(legacy_test_versions
-  v00-16-05
-  v00-16-06
-)
-
-foreach(version IN LISTS legacy_test_versions)
+foreach(version IN LISTS sio_legacy_test_versions)
   ADD_PODIO_LEGACY_TEST(${version} read_frame_sio ${version}-example_frame.sio)
   ADD_PODIO_LEGACY_TEST(${version} read_frame_legacy_sio ${version}-example.sio)
 endforeach()