Revert of 868e568 (mixedBase_merge1 test is back).

root-project · Dec 4, 2024 · 615d88b · 615d88b
1 parent 142247c
commit 615d88b
Showing 1 changed file with 6 additions and 6 deletions.
diff --git 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