From dc32e5e3ad8a62d280adfc9bb22b73f7aae1578c Mon Sep 17 00:00:00 2001 From: tmadlener Date: Thu, 2 May 2024 16:21:51 +0200 Subject: [PATCH 1/3] Enable RNTuple in sanitizer CI builds --- .github/workflows/sanitizers.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/sanitizers.yaml b/.github/workflows/sanitizers.yaml index afeefa15e..da47f859f 100644 --- a/.github/workflows/sanitizers.yaml +++ b/.github/workflows/sanitizers.yaml @@ -44,6 +44,7 @@ jobs: -DUSE_EXTERNAL_CATCH2=OFF \ -DENABLE_SIO=ON \ -DENABLE_JULIA=ON \ + -DENABLE_RNTUPLE=ON \ -G Ninja .. echo "::endgroup::" echo "::group::Build" From f7366145dea0a85453c476da6c965f4c98fbd450 Mon Sep 17 00:00:00 2001 From: tmadlener Date: Thu, 2 May 2024 16:43:31 +0200 Subject: [PATCH 2/3] Disable the tests that require python --- tests/CTestCustom.cmake | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tests/CTestCustom.cmake b/tests/CTestCustom.cmake index 396c32b78..08f645e48 100644 --- a/tests/CTestCustom.cmake +++ b/tests/CTestCustom.cmake @@ -19,6 +19,10 @@ if ((NOT "@FORCE_RUN_ALL_TESTS@" STREQUAL "ON") AND (NOT "@USE_SANITIZER@" STREQ read_python_frame_root read_and_write_frame_root + write_python_frame_rntuple + read_python_frame_rntuple + read_and_write_frame_rntuple + write_frame_root read_frame_root @@ -34,6 +38,8 @@ if ((NOT "@FORCE_RUN_ALL_TESTS@" STREQUAL "ON") AND (NOT "@USE_SANITIZER@" STREQ podio-dump-detailed-root podio-dump-legacy_root_v00-16-06 podio-dump-legacy_root-detailed_v00-16-06 + podio-dump-rntuple + podio-dump-detailed-rntuple podio-dump-sio podio-dump-detailed-sio @@ -42,6 +48,8 @@ if ((NOT "@FORCE_RUN_ALL_TESTS@" STREQUAL "ON") AND (NOT "@USE_SANITIZER@" STREQ datamodel_def_store_roundtrip_root datamodel_def_store_roundtrip_root_extension + datamodel_def_store_roundtrip_rntuple + datamodel_def_store_roundtrip_rntuple_extension datamodel_def_store_roundtrip_sio datamodel_def_store_roundtrip_sio_extension From 9af1de384a65401236f44b75ff4a6bdeb5e98bc4 Mon Sep 17 00:00:00 2001 From: tmadlener Date: Thu, 2 May 2024 17:04:43 +0200 Subject: [PATCH 3/3] Rename test for consistency --- tools/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt index 8c10f98c2..c5fa5d4d8 100644 --- a/tools/CMakeLists.txt +++ b/tools/CMakeLists.txt @@ -94,7 +94,7 @@ if(BUILD_TESTING) if (ENABLE_RNTUPLE) CREATE_DUMP_TEST(podio-dump-rntuple "write_rntuple" ${PROJECT_BINARY_DIR}/tests/root_io/example_rntuple.root) - CREATE_DUMP_TEST(podio-dump-rntuple-detailed "write_rntuple" --detailed --category events --entries 1:3 ${PROJECT_BINARY_DIR}/tests/root_io/example_rntuple.root) + CREATE_DUMP_TEST(podio-dump-detailed-rntuple "write_rntuple" --detailed --category events --entries 1:3 ${PROJECT_BINARY_DIR}/tests/root_io/example_rntuple.root) endif() endif()