[rootest] improve cmake of root/meta tests

roottest/root/meta/MakeProject/CMakeLists.txt

@@ -1,12 +1,16 @@
-ROOTTEST_GENERATE_DICTIONARY(stl_makeproject_test stl_makeproject_test.h LINKDEF stl_makeproject_test_linkdef.h NO_ROOTMAP NO_CXXMODULE)
+ROOTTEST_GENERATE_DICTIONARY(stl_makeproject_test
+                             stl_makeproject_test.h
+                             LINKDEF stl_makeproject_test_linkdef.h
+                             NO_ROOTMAP NO_CXXMODULE
+                             FIXTURES_SETUP root-meta-MakeProject-stl_makeproject_test-fixture)
 # If we build roottest in-tree, add a dependecy on Hist because the header
 # includes TH1D.
 if(TARGET Hist)
   add_dependencies(stl_makeproject_test Hist)
 endif()
 
-if(ROOT_runtime_cxxmodules_FOUND)
-  # FIXME: For C++ modules builds, module.modulemap is generated during configuration time 
+if(runtime_cxxmodules)
+  # FIXME: For C++ modules builds, module.modulemap is generated during configuration time
   # and it is not needed during execution of stltest*, but later for other tests it needs to be back in build directory.
   # FIXME: We need to run some tests in serial mode, because in very-parallel builds,
   # since they access the same build directory, they could conflict via existent/not module.modulemap file.
@@ -18,8 +22,7 @@ if(ROOT_runtime_cxxmodules_FOUND)
                   OUTCNV atlasaod_convert.sh
                   OUTREF atlasaod.ref
                   LABELS longtest
-                  RUN_SERIAL
-                  )
+                  RUN_SERIAL)
 
     ROOTTEST_ADD_TEST(runcms310
                   COPY_TO_BUILDDIR enable_modulemap.sh
@@ -39,34 +42,35 @@ if(ROOT_runtime_cxxmodules_FOUND)
                   OUTCNV aliceesd_convert.sh
                   OUTREF aliceesd.ref
                   RUN_SERIAL)
-    
+
     ROOTTEST_ADD_TEST(examples
-                  COPY_TO_BUILDDIR enable_modulemap.sh
+                  COPY_TO_BUILDDIR enable_modulemap.sh disable_modulemap.sh stl_makeproject_test.h
                   PRECMD ./enable_modulemap.sh ${CMAKE_CURRENT_BINARY_DIR}
-                  COPY_TO_BUILDDIR stl_makeproject_test.h
                   MACRO create_makeproject_examples.C
                   OUTREF create_makeproject_examples.ref
-                  DEPENDS ${GENERATE_DICTIONARY_TEST} stl_makeproject_test-build)
+                  FIXTURES_REQUIRED root-meta-MakeProject-stl_makeproject_test-fixture
+                  FIXTURES_SETUP root-meta-MakeProject-examples-fixture)
 
     ROOTTEST_ADD_TEST(stltest
-                  COPY_TO_BUILDDIR disable_modulemap.sh enable_modulemap.sh
                   PRECMD ./disable_modulemap.sh ${CMAKE_CURRENT_BINARY_DIR}
                   MACRO runstltest.C
                   POSTCMD ./enable_modulemap.sh ${CMAKE_CURRENT_BINARY_DIR}
                   OUTREF teststlCTEST.ref
-                  DEPENDS examples)
+                  FIXTURES_REQUIRED root-meta-MakeProject-examples-fixture
+                  FIXTURES_SETUP root-meta-MakeProject-stltest-fixture)
 
     ROOTTEST_ADD_TEST(stltest2
-                  COPY_TO_BUILDDIR disable_modulemap.sh enable_modulemap.sh
                   PRECMD ./disable_modulemap.sh ${CMAKE_CURRENT_BINARY_DIR}
                   MACRO runstltest2.C
                   POSTCMD ./enable_modulemap.sh ${CMAKE_CURRENT_BINARY_DIR}
-                  DEPENDS stltest)
+                  OUTREF stltest2.ref
+                  FIXTURES_REQUIRED root-meta-MakeProject-stltest-fixture)
 
     ROOTTEST_ADD_TEST(foreign
                   COPY_TO_BUILDDIR enable_modulemap.sh foreign.root
                   PRECMD ./enable_modulemap.sh ${CMAKE_CURRENT_BINARY_DIR}
                   MACRO runforeign.C
+                  OUTREF foreign.ref
                   RUN_SERIAL)
 else()
       ROOTTEST_ADD_TEST(runatlasaod
@@ -88,24 +92,28 @@ else()
                   MACRO runaliceesd.C
                   OUTCNV aliceesd_convert.sh
                   OUTREF aliceesd.ref)
-    
+
     ROOTTEST_ADD_TEST(examples
                   COPY_TO_BUILDDIR stl_makeproject_test.h
                   MACRO create_makeproject_examples.C
                   OUTREF create_makeproject_examples.ref
-                  DEPENDS ${GENERATE_DICTIONARY_TEST} stl_makeproject_test-build)
+                  FIXTURES_REQUIRED root-meta-MakeProject-stl_makeproject_test-fixture
+                  FIXTURES_SETUP root-meta-MakeProject-examples-fixture)
 
     ROOTTEST_ADD_TEST(stltest
                   MACRO runstltest.C
                   OUTREF teststlCTEST${ref_suffix}
-                  DEPENDS examples)
-
+                  FIXTURES_REQUIRED root-meta-MakeProject-examples-fixture
+                  FIXTURES_SETUP root-meta-MakeProject-stltest-fixture)
+
     ROOTTEST_ADD_TEST(stltest2
                   MACRO runstltest2.C
-                  DEPENDS stltest)
+                  OUTREF stltest2.ref
+                  FIXTURES_REQUIRED root-meta-MakeProject-stltest-fixture)
 
     ROOTTEST_ADD_TEST(foreign
-                  COPY_TO_BUILDDIR foreign.root
-                  MACRO runforeign.C)
+                      COPY_TO_BUILDDIR foreign.root
+                      MACRO runforeign.C
+                      OUTREF foreign.ref)
 endif()
 

roottest/root/meta/MakeProject/foreign.ref

@@ -2,6 +2,6 @@
 Processing runforeign.C...
 Warning in <TClass::Init>: no dictionary for class ndtf::FinalStateParticle is available
 MakeProject has generated 1 classes in foreign
-MAKEP file has been generated
-foreign.so has been generated
-foreign.so has been dynamically linked
+foreign/MAKEP file has been generated
+Shared lib foreign/foreign.so has been generated
+Shared lib foreign/foreign.so has been dynamically linked

roottest/root/meta/MakeProject/foreign_win32.ref

@@ -0,0 +1,10 @@
+
+Processing runforeign.C...
+Warning in <TClass::Init>: no dictionary for class ndtf::FinalStateParticle is available
+
+
+foreignProjectSource.cxx
+MakeProject has generated 1 classes in foreign
+foreign/MAKEP file has been generated
+Shared lib foreign/foreign.so has been generated
+Shared lib foreign/foreign.so has been dynamically linked

roottest/root/meta/MakeProject/foreign_win64.ref

@@ -0,0 +1,10 @@
+
+Processing runforeign.C...
+Warning in <TClass::Init>: no dictionary for class ndtf::FinalStateParticle is available
+
+
+foreignProjectSource.cxx
+MakeProject has generated 1 classes in foreign
+foreign/MAKEP file has been generated
+Shared lib foreign/foreign.so has been generated
+Shared lib foreign/foreign.so has been dynamically linked

roottest/root/meta/ROOT-10804/CMakeLists.txt

@@ -1,8 +1,10 @@
-ROOTTEST_GENERATE_REFLEX_DICTIONARY(ROOT10804 ROOT10804.h SELECTION selection.xml)
-set(depends ${GENERATE_REFLEX_TEST})
+ROOTTEST_GENERATE_REFLEX_DICTIONARY(ROOT10804
+                                    ROOT10804.h
+                                    SELECTION selection.xml
+                                    FIXTURES_SETUP root-meta-10804-fixture)
 
 ROOTTEST_ADD_TEST(execROOT10804
                   MACRO execROOT10804.C
                   OUTREF execROOT10804.oref
                   ERRREF execROOT10804.eref
-                  DEPENDS ${depends})
+                  FIXTURES_REQUIRED root-meta-10804-fixture)

roottest/root/meta/ROOT-5694/CMakeLists.txt

@@ -2,15 +2,15 @@ if(NOT MSVC OR win_broken_tests)
     ROOTTEST_GENERATE_REFLEX_DICTIONARY(One One.h
                                         SELECTION One_selection.xml
                                         NO_ROOTMAP
-                                        FIXTURES_SETUP execLoadLibs_fixture)
+                                        FIXTURES_SETUP root-meta-5694-One-fixture)
 
     ROOTTEST_GENERATE_REFLEX_DICTIONARY(Two Two.h
                                         SELECTION Two_selection.xml
                                         NO_ROOTMAP
-                                        FIXTURES_SETUP execLoadLibs_fixture)
+                                        FIXTURES_SETUP root-meta-5694-Two-fixture)
     ROOTTEST_ADD_TEST(execLoadLibs
                       MACRO execLoadLibs.C
                       OUTREF execLoadLibs.oref
                       ERRREF execLoadLibs.eref
-                      FIXTURES_REQUIRED execLoadLibs_fixture)
+                      FIXTURES_REQUIRED root-meta-5694-One-fixture root-meta-5694-Two-fixture)
 endif()

roottest/root/meta/ROOT-7181/CMakeLists.txt

@@ -1,8 +1,44 @@
-#-------------------------------------------------------------------------------
-#
-# Placeholder file to translate the tests to the new CTest system. Meanwhile we
-# define a CTest test that calls 'make' in ${CMAKE_CURRENT_SOURCE_DIR}
-#
-#-------------------------------------------------------------------------------
-
-ROOTTEST_ADD_OLDTEST()
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/inc)
+
+ROOTTEST_GENERATE_REFLEX_DICTIONARY(btag
+                                    inc/BTagVertex_v1.h
+                                    SELECTION inc/btag_selection.xml
+                                    FIXTURES_SETUP root-meta-7181-btag-fixture)
+
+ROOTTEST_GENERATE_REFLEX_DICTIONARY(jet
+                                    inc/Jet_v1.h
+                                    SELECTION inc/jet_selection.xml
+                                    FIXTURES_SETUP root-meta-7181-jet-fixture)
+
+ROOTTEST_GENERATE_REFLEX_DICTIONARY(sjet
+                                    inc/SJet_v1.h
+                                    SELECTION inc/sjet_selection.xml
+                                    FIXTURES_SETUP root-meta-7181-sjet-fixture)
+
+macro(ROOT_7181_TEST name use_rmap)
+  if(${use_rmap} STREQUAL "true")
+    set(testname rmap-${name})
+  else()
+    set(testname ${name})
+  endif()
+
+  ROOTTEST_ADD_TEST(${testname}
+                    MACRO runscript.C
+                    MACROARG "\"${CMAKE_CURRENT_SOURCE_DIR}/scripts/${name}.script\",${use_rmap}"
+                    ROOTEXE_OPTS -e "gInterpreter->AddIncludePath(\"-I${CMAKE_CURRENT_SOURCE_DIR}\")"
+                                 -e "gInterpreter->AddIncludePath(\"-I${CMAKE_CURRENT_SOURCE_DIR}/inc\")"
+                    OUTREF ${testname}.ref
+                    FIXTURES_REQUIRED root-meta-7181-btag-fixture
+                                      root-meta-7181-jet-fixture
+                                      root-meta-7181-sjet-fixture)
+endmacro(ROOT_7181_TEST)
+
+ROOT_7181_TEST(case1 false)
+ROOT_7181_TEST(case2 false)
+ROOT_7181_TEST(case3 false)
+ROOT_7181_TEST(case4 false)
+
+ROOT_7181_TEST(case1 true)
+ROOT_7181_TEST(case2 true)
+ROOT_7181_TEST(case3 true)
+ROOT_7181_TEST(case4 true)