[roottest] use cmake for all root/tree tests

cmake/modules/RootMacros.cmake

@@ -2756,7 +2756,7 @@ macro(ROOTTEST_SETUP_MACROTEST)
   set(root_buildcmd ${ROOT_root_CMD} ${RootExeDefines} -q -l -b)
 
   # Compile macro, then add to CTest.
-  if(ARG_MACRO MATCHES "[.]C\\+" OR ARG_MACRO MATCHES "[.]cxx\\+")
+  if(ARG_MACRO MATCHES "[.]C\\+" OR ARG_MACRO MATCHES "[.]cxx\\+" OR ARG_MACRO MATCHES "[.]cpp\\+" OR ARG_MACRO MATCHES "[.]cc\\+")
     string(REPLACE "+" "" compile_name "${ARG_MACRO}")
     get_filename_component(realfp ${compile_name} REALPATH)
 
@@ -2767,7 +2767,7 @@ macro(ROOTTEST_SETUP_MACROTEST)
     endif()
 
   # Add interpreted macro to CTest.
-  elseif(ARG_MACRO MATCHES "[.]C" OR ARG_MACRO MATCHES "[.]cxx")
+  elseif(ARG_MACRO MATCHES "[.]C" OR ARG_MACRO MATCHES "[.]cxx" OR ARG_MACRO MATCHES "[.]cpp" OR ARG_MACRO MATCHES "[.]cc")
     get_filename_component(realfp ${ARG_MACRO} REALPATH)
     if(DEFINED ARG_MACROARG)
       set(realfp "${realfp}(${ARG_MACROARG})")

roottest/.gitignore

@@ -844,10 +844,6 @@ root/tree/addresses/converterIssues/ExtHit/ExtHitProjectDict.cxx
 /root/tree/selector/lhef_*_gen.C
 /root/tree/selector/lhef_*_gen.h
 
-
-# /root/tree/selectorreader/
-/root/tree/selectorreader/generated_selectors/
-
 # /root/tree/split/
 /root/tree/split/abstract.root
 /root/tree/split/customClassTree.root

roottest/root/tree/addresses/CMakeLists.txt

@@ -1,8 +1,261 @@
-#-------------------------------------------------------------------------------
-#
-# 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(LABELS longtest)
+ROOTTEST_ADD_TESTDIRS()
 
+ROOTTEST_COMPILE_MACRO(inherit.C
+                       FIXTURES_SETUP root-tree-addresses-inherit-fixture)
+
+if(ClingWorkAroundMissingDynamicScope)
+  SET(_inherit_opts -e "(void)gROOT->ProcessLine(\".L inherit.C+g\")")
+endif()
+
+ROOTTEST_ADD_TEST(inherit
+                  MACRO runInherit.C
+                  ROOTEXE_OPTS ${_inherit_opts}
+                  OUTREF inheritTest.ref
+                  FIXTURES_REQUIRED root-tree-addresses-inherit-fixture)
+
+ROOTTEST_COMPILE_MACRO(header.h
+                       FIXTURES_SETUP root-tree-addresses-header-fixture)
+
+if(ClingWorkAroundMissingDynamicScope)
+  SET(_header_opts -e "(void)gROOT->ProcessLine(\".L header.h+g\")")
+endif()
+
+ROOTTEST_ADD_TEST(header
+                  MACRO runHeader.C
+                  ROOTEXE_OPTS ${_header_opts}
+                  OUTREF headerTest.ref
+                  FIXTURES_REQUIRED root-tree-addresses-header-fixture)
+
+ROOTTEST_COMPILE_MACRO(clonesA_Event.cxx
+                       FIXTURES_SETUP root-tree-addresses-clonesA_Event-fixture)
+
+if(ClingWorkAroundMissingDynamicScope)
+  SET(_clonesA_opts -e "(void)gROOT->ProcessLine(\".L clonesA_Event.cxx+\")")
+endif()
+
+ROOTTEST_ADD_TEST(clonesA
+                  MACRO clonesA_rw.C
+                  ROOTEXE_OPTS ${_clonesA_opts}
+                  FIXTURES_REQUIRED root-tree-addresses-clonesA_Event-fixture)
+
+ROOTTEST_COMPILE_MACRO(Embedded_load.C
+                       FIXTURES_SETUP root-tree-addresses-Embedded_load-fixture)
+
+if(ClingWorkAroundMissingDynamicScope)
+  SET(_embedLoad_opts -e "(void)gROOT->ProcessLine(\".L Embedded_load.C+\")")
+endif()
+
+ROOTTEST_ADD_TEST(embwrite
+                  MACRO embwrite.C
+                  ROOTEXE_OPTS ${_embedLoad_opts}
+                  FIXTURES_REQUIRED root-tree-addresses-Embedded_load-fixture
+                  FIXTURES_SETUP root-tree-addresses-embwrite-fixture)
+
+ROOTTEST_ADD_TEST(embread
+                  MACRO embread.C
+                  ROOTEXE_OPTS ${_embedLoad_opts}
+                  OUTREF EmbeddedTest.ref
+                  FIXTURES_REQUIRED root-tree-addresses-Embedded_load-fixture
+                                    root-tree-addresses-embwrite-fixture)
+
+# disable on Windows because relations_write.C compilation problem
+# in any case test cannot be run on Windows because of sed usage
+if(NOT MSVC OR win_broken_tests)
+  ROOTTEST_COMPILE_MACRO(relations_load.C
+                         FIXTURES_SETUP root-tree-addresses-relations_load-fixture)
+
+  ROOTTEST_COMPILE_MACRO(relations_read.C
+                         FIXTURES_SETUP root-tree-addresses-relations_read-fixture)
+
+  ROOTTEST_COMPILE_MACRO(relations_write.C
+                         FIXTURES_SETUP root-tree-addresses-relations_write-fixture)
+
+  SET(_relations_opts -e "(void)gROOT->ProcessLine(\".L relations_load.C+\")"
+                      -e "(void)gROOT->ProcessLine(\".L relations_write.C+\")"
+                      -e "(void)gROOT->ProcessLine(\".L relations_read.C+\")")
+
+  ROOTTEST_ADD_TEST(relations
+                    MACRO relationsRun.C
+                    ROOTEXE_OPTS ${_relations_opts}
+                    OUTREF relationsTest.ref
+                    OUTCNVCMD sed -e "s|File  Size =.*\\*||g"
+                    FIXTURES_REQUIRED root-tree-addresses-relations_load-fixture
+                                      root-tree-addresses-relations_read-fixture
+                                      root-tree-addresses-relations_write-fixture)
+endif()
+
+# disable on Windows because of problem with running same macro twice
+if(NOT MSVC OR win_broken_tests)
+  ROOTTEST_ADD_TEST(merging
+                    MACRO runmerging.C
+                    OUTREF merging.ref)
+endif()
+
+# disable on Windows because of utils.cc usage which has some troubles with windows.h
+if(NOT MSVC OR win_broken_tests)
+  ROOTTEST_COMPILE_MACRO(iobug.C
+                         FIXTURES_SETUP root-tree-addresses-iobug-fixture)
+
+  ROOTTEST_COMPILE_MACRO(${CMAKE_SOURCE_DIR}/roottest/scripts/utils.cc
+                         FIXTURES_SETUP root-tree-addresses-utils-fixture)
+
+  ROOTTEST_ADD_TEST(iobug
+                    MACRO runiobug.C
+                    ROOTEXE_OPTS -e "(void)gSystem->Load(\"utils_cc\")"
+                    OUTREF iobug.ref
+                    FIXTURES_REQUIRED root-tree-addresses-iobug-fixture root-tree-addresses-utils-fixture)
+endif()
+
+ROOTTEST_COMPILE_MACRO(userClass.C
+                       FIXTURES_SETUP root-tree-addresses-userClass-fixture)
+
+ROOTTEST_COMPILE_MACRO(treeBranch.C
+                       FIXTURES_SETUP root-tree-addresses-treeBranch-fixture)
+
+if(ClingWorkAroundMissingUnloading)
+  set(_treeBranch_ref treeBranch.ref-missingUnloading)
+else()
+  set(_treeBranch_ref treeBranch.ref)
+endif()
+
+ROOTTEST_ADD_TEST(treeBranch
+                  MACRO runtreeBranch.C
+                  OUTREF ${_treeBranch_ref}
+                  FIXTURES_REQUIRED root-tree-addresses-userClass-fixture
+                                    root-tree-addresses-treeBranch-fixture)
+
+ROOTTEST_COMPILE_MACRO(test_Persistency0.C
+                       FIXTURES_SETUP root-tree-addresses-test_Persistency0-fixture)
+
+ROOTTEST_COMPILE_MACRO(test_Persistency1.C
+                       FIXTURES_SETUP root-tree-addresses-test_Persistency1-fixture)
+
+ROOTTEST_COMPILE_MACRO(test_Persistency3.C
+                       FIXTURES_SETUP root-tree-addresses-test_Persistency3-fixture)
+
+ROOTTEST_ADD_TEST(inheritAndOwn
+                  MACRO runinheritAndOwn.C
+                  OUTREF inheritAndOwn.ref
+                  FIXTURES_REQUIRED root-tree-addresses-test_Persistency0-fixture
+                                    root-tree-addresses-test_Persistency3-fixture)
+
+ROOTTEST_ADD_TEST(BadBaseAddresses
+                  MACRO runBadBaseAddresses.C
+                  OUTREF BadBaseAddresses.ref
+                  FIXTURES_REQUIRED root-tree-addresses-test_Persistency1-fixture)
+
+ROOTTEST_ADD_TEST(ursula
+                  MACRO runursula.C
+                  COPY_TO_BUILDDIR cmsursula.root
+                  OUTREF ursula.ref)
+
+#disable on Windows while there are problem to compile ConfigRecord.cxx without building dictionary
+#for some classes
+if(NOT MSVC OR win_broken_tests)
+  ROOTTEST_COMPILE_MACRO(ConfigRecord.cxx
+                         FIXTURES_SETUP root-tree-addresses-ConfigRecord-fixture)
+
+  ROOTTEST_COMPILE_MACRO(sueloader.C
+                         FIXTURES_SETUP root-tree-addresses-sueloader-fixture)
+
+  if(ClingWorkAroundMissingDynamicScope)
+    SET(_sue_opts -e "(void)gROOT->ProcessLine(\".L sueloader.C+\")"
+                  -e "(void)gROOT->ProcessLine(\".L ConfigRecord.cxx+\")")
+  endif()
+
+  ROOTTEST_ADD_TEST(configtest
+                    MACRO suetestwrt.C
+                    ROOTEXE_OPTS ${_sue_opts}
+                    OUTREF configtest.ref
+                    FIXTURES_REQUIRED root-tree-addresses-ConfigRecord-fixture
+                                      root-tree-addresses-sueloader-fixture
+                   FIXTURES_SETUP root-tree-addresses-configtest-fixture)
+
+  ROOTTEST_ADD_TEST(suetest
+                    MACRO suetestrd.C
+                    ROOTEXE_OPTS ${_sue_opts}
+                    OUTREF suetest.ref
+                    FIXTURES_REQUIRED root-tree-addresses-ConfigRecord-fixture
+                                      root-tree-addresses-sueloader-fixture
+                                      root-tree-addresses-configtest-fixture)
+endif()
+
+ROOTTEST_COMPILE_MACRO(JansEvent.C
+                       FIXTURES_SETUP root-tree-addresses-JansEvent-fixture)
+
+ROOTTEST_ADD_TEST(Jantest
+                  MACRO runJantest.C
+                  COPY_TO_BUILDDIR janbug.root
+                  OUTREF Jantest.ref
+                  FIXTURES_REQUIRED root-tree-addresses-JansEvent-fixture)
+
+ROOTTEST_ADD_TEST(deepnest
+                  MACRO rundeepnest.C+
+                  OUTREF deepnest.ref)
+
+ROOTTEST_ADD_TEST(baseString
+                  MACRO runbaseString.C+
+                  OUTREF baseString.ref)
+
+ROOTTEST_ADD_TEST(prova
+                  MACRO runprova.C
+                  COPY_TO_BUILDDIR prova1.root prova2.root
+                  OUTREF prova.ref)
+
+ROOTTEST_ADD_TEST(augertest
+                  MACRO runaugertest.C
+                  COPY_TO_BUILDDIR data/S_1_1004_qgsjet_100_1.KGrec.root
+                                   data/S_1_104_qgsjet_100_1.KGrec.root
+                  OUTREF augertest.ref)
+
+ROOTTEST_ADD_TEST(longlong
+                  MACRO runlonglong.C+
+                  OUTCNVCMD sed -e s:0x[0-9a-fA-F]*:0xRemoved:g
+                  OUTREF longlong.ref)
+
+ROOTTEST_ADD_TEST(memleak
+                  MACRO runmemleak.C+
+                  COPY_TO_BUILDDIR memleak.root
+                  OUTREF memleak.ref)
+
+ROOTTEST_ADD_TEST(Leaflist
+                  MACRO execLeaflist.C
+                  COPY_TO_BUILDDIR leaflist.root
+                  OUTREF execLeaflist.ref)
+
+ROOTTEST_ADD_TEST(twrite
+                  MACRO assert_twrite.cxx+
+                  ERRREF assert_twrite.ref
+                  FIXTURES_SETUP root-tree-addresses-twrite-fixture)
+
+ROOTTEST_COMPILE_MACRO(assert_tread.cxx
+                       FIXTURES_SETUP root-tree-addresses-assert_tread-fixture)
+
+ROOTTEST_ADD_TEST(tread
+                  MACRO assert_tread.cxx+
+                  ERRREF assert_tread.ref
+                  FIXTURES_REQUIRED root-tree-addresses-twrite-fixture root-tree-addresses-assert_tread-fixture)
+
+ROOTTEST_ADD_TEST(ReuseTree
+                  MACRO execReuseTree.C
+                  OUTREF execReuseTree.ref)
+
+ROOTTEST_ADD_TEST(BranchObjSplit0
+                  MACRO execBranchObjSplit0.C
+                  OUTREF execBranchObjSplit0.ref)
+
+ROOTTEST_ADD_TEST(CheckErrors
+                  MACRO execCheckErrors.C
+                  OUTREF execCheckErrors.ref)
+
+ROOTTEST_ADD_TEST(CMSobj
+                  MACRO execCMSobj.cxx+
+                  OUTREF execCMSobj.ref)
+
+ROOTTEST_COMPILE_MACRO(jet.C
+                       FIXTURES_SETUP root-tree-addresses-jet-fixture)
+
+ROOTTEST_ADD_TEST(Jet
+                  MACRO runJet.C
+                  OUTREF Jet.ref
+                  FIXTURES_REQUIRED root-tree-addresses-jet-fixture)

roottest/root/tree/addresses/ConfigRecord.cxx

@@ -1,7 +1,5 @@
 #ifndef ConfigRecord_cxx
-#ifdef ClingWorkAroundMultipleInclude
 #define ConfigRecord_cxx
-#endif
 
 #include "ConfigRecord.h"
 

roottest/root/tree/addresses/ConfigRecord.h

@@ -1,16 +1,19 @@
+#ifndef ConfigRecord_h
+#define ConfigRecord_h
 
 #include "RecHeader.h"
-#include "RecDataRecord.cxx"
-#include "RecRecordImp.cxx"
+#include "RecDataRecord.h"
 
 class ConfigRecord : public RecDataRecord<RecHeader>
 {
 
 public:
   ConfigRecord() {}
-  ConfigRecord(const RecHeader& header) : RecDataRecord<RecHeader>(header){} 
+  ConfigRecord(const RecHeader& header) : RecDataRecord<RecHeader>(header){}
   ~ConfigRecord() override {}
 
 
 ClassDefOverride(ConfigRecord,1)                                 // ConfigRecord
 };
+
+#endif

roottest/root/tree/addresses/Context.cxx

@@ -1,17 +1,16 @@
-#include <iostream>
-using namespace std;
-
 #include "Context.h"
 
+#include <iostream>
+
 ClassImp(Context)
 
 //_____________________________________________________________________________
 void Context::Print(Option_t *) const
 {
    // Print this object
 
-  cout << "Context::Print " << endl;
-  cout << "Detector " << fDetector << " SimFlag " << fSimFlag 
-       << " Time " << fTimeStamp << endl;
+  std::cout << "Context::Print " << std::endl;
+  std::cout << "Detector " << fDetector << " SimFlag " << fSimFlag
+       << " Time " << fTimeStamp << std::endl;
 }
 

roottest/root/tree/addresses/JansEvent.C

@@ -206,7 +206,7 @@ void JansEvent::reset()
     eventHeader.reset();
     bList.Clear();
 }
-#include "Riostream.h"
+#include <iostream>
 #include "TTree.h"
 
 void testJan() {

roottest/root/tree/addresses/Jet.ref

@@ -0,0 +1,17 @@
+
+Processing runJet.C...
+In event 0 jet #0 value are correct 0,33,44,55,0
+In event 0 jet #1 value are correct 0,33,44,55,1
+In event 0 jet #2 value are correct 0,33,44,55,2
+In event 0 jet #3 value are correct 0,33,44,55,3
+In event 0 jet #4 value are correct 0,33,44,55,4
+In event 1 jet #0 value are correct 1,33,44,55,0
+In event 1 jet #1 value are correct 1,33,44,55,1
+In event 1 jet #2 value are correct 1,33,44,55,2
+In event 1 jet #3 value are correct 1,33,44,55,3
+In event 1 jet #4 value are correct 1,33,44,55,4
+In event 2 jet #0 value are correct 2,33,44,55,0
+In event 2 jet #1 value are correct 2,33,44,55,1
+In event 2 jet #2 value are correct 2,33,44,55,2
+In event 2 jet #3 value are correct 2,33,44,55,3
+In event 2 jet #4 value are correct 2,33,44,55,4