From 615d88be7ca67922d9881eda5f6c9fb347368f8e Mon Sep 17 00:00:00 2001 From: Marta Czurylo Date: Wed, 4 Dec 2024 14:17:21 +0100 Subject: [PATCH] Revert of 868e568 (mixedBase_merge1 test is back). --- root/meta/evolution/CMakeLists.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/root/meta/evolution/CMakeLists.txt b/root/meta/evolution/CMakeLists.txt index e96e98a100..6f2fefe023 100644 --- a/root/meta/evolution/CMakeLists.txt +++ b/root/meta/evolution/CMakeLists.txt @@ -76,12 +76,12 @@ ROOTTEST_ADD_TEST(mixedBase_53410_v2 OUTREF mixedBase_53410_v2.ref DEPENDS execMixedBaseClass_v2) -# ROOTTEST_ADD_TEST(mixedBase_merge1 -# PRECMD hadd -f mixedBase_merge1.root mixedBase_v1.root mixedBase_v2.root -# MACRO execMixedBaseClass_v2.cxx+ -# MACROARG "\"mixedBase_merge1.root\"" -# OUTREF mixedBase_merge1.ref -# DEPENDS execMixedBaseClass_v2 ) +ROOTTEST_ADD_TEST(mixedBase_merge1 + PRECMD hadd -f mixedBase_merge1.root mixedBase_v1.root mixedBase_v2.root + MACRO execMixedBaseClass_v2.cxx+ + MACROARG "\"mixedBase_merge1.root\"" + OUTREF mixedBase_merge1.ref + DEPENDS execMixedBaseClass_v2 ) ROOTTEST_ADD_TEST(mixedBase_merge2 PRECMD hadd -f mixedBase_merge2.root mixedBase_v2.root mixedBase_v1.root