[roottest] root/tree, part 4

roottest/root/tree/fastcloning/CMakeLists.txt

@@ -26,52 +26,61 @@ ROOTTEST_ADD_TEST(execmisstop
                   MACRO execmisstop.C
                   OUTREF references/execmisstop.ref)
 
-ROOTTEST_ADD_TEST(runabstract-datageneration
-                  COPY_TO_BUILDDIR abstract.C
-                  COMMAND ${ROOT_root_CMD} -b -q -l "${CMAKE_CURRENT_BINARY_DIR}/abstract.C+(0)")
+ROOTTEST_COMPILE_MACRO(abstract.C
+                       FIXTURES_SETUP root-tree-fastcloning-abstract-fixture)
+
+ROOTTEST_ADD_TEST(runabstract-datageneration0
+                  MACRO abstract.C+
+                  MACROARG 0
+                  FIXTURES_REQUIRED root-tree-fastcloning-abstract-fixture
+                  FIXTURES_SETUP root-tree-fastcloning-runabstract-datageneration0-fixture)
+
+ROOTTEST_ADD_TEST(runabstract-datageneration1
+                  MACRO abstract.C+
+                  MACROARG 1
+                  FIXTURES_REQUIRED root-tree-fastcloning-abstract-fixture
+                                    root-tree-fastcloning-runabstract-datageneration0-fixture
+                  FIXTURES_SETUP root-tree-fastcloning-runabstract-datageneration1-fixture)
 
 ROOTTEST_ADD_TEST(runabstract-copy
                   MACRO runabstract.C
-                  PRECMD ${ROOT_root_CMD} -b -q -l "${CMAKE_CURRENT_BINARY_DIR}/abstract.C+(1)"
                   OUTREF references/abstract.ref
-                  DEPENDS runabstract-datageneration)
+                  FIXTURES_REQUIRED root-tree-fastcloning-runabstract-datageneration1-fixture)
 
 ROOTTEST_ADD_TEST(runfilemergererror
                   MACRO runfilemergererror.C
                   OUTREF references/runfilemergererror.ref)
 
 ROOTTEST_ADD_TEST(runoutoforder-datageneration
-                  COPY_TO_BUILDDIR files/Tuple_1.root
-                  COPY_TO_BUILDDIR files/Tuple_2.root
-                  COMMAND ${ROOT_hadd_CMD} -f Tuple_merge.root Tuple_1.root Tuple_2.root)
+                  COPY_TO_BUILDDIR files/Tuple_1.root files/Tuple_2.root
+                  COMMAND ${ROOT_hadd_CMD} -f Tuple_merge.root Tuple_1.root Tuple_2.root
+                  FIXTURES_SETUP root-tree-fastcloning-runoutoforder-datageneration-fixture)
 
 ROOTTEST_ADD_TEST(runoutoforder
                   MACRO runoutoforder.C
                   OUTREF references/runoutoforder.ref
-                  DEPENDS runoutoforder-datageneration)
+                  FIXTURES_REQUIRED root-tree-fastcloning-runoutoforder-datageneration-fixture)
 
 ROOTTEST_ADD_TEST(runPlot
                   MACRO runPlot.C
                   COPY_TO_BUILDDIR files/recon-v1r030603p6_700000811_00000-00984_calTuple.root
-                  COPY_TO_BUILDDIR files/recon-v1r030603p6_700000811_02955-03939_calTuple.root
+                                   files/recon-v1r030603p6_700000811_02955-03939_calTuple.root
                   OUTREF references/runPlot.ref)
 
 ROOTTEST_ADD_TEST(runbadmix
                   MACRO runbadmix.C
-                  PRECMD ${ROOT_root_CMD} -b -q -l ${CMAKE_CURRENT_SOURCE_DIR}/runbadmix.C
                   OUTREF references/runbadmix.ref)
 
 ROOTTEST_ADD_TEST(runSplitMismatch
-                  COPY_TO_BUILDDIR runSplitMismatch.C
-                  MACRO ${CMAKE_CURRENT_BINARY_DIR}/runSplitMismatch.C+
+                  MACRO runSplitMismatch.C+
                   OUTREF references/runSplitMismatch.ref)
 
 ROOTTEST_ADD_TEST(make_CloneTree
                   MACRO make_CloneTree.C
-                  COPY_TO_BUILDDIR files/ver_40200.root
-                  COPY_TO_BUILDDIR files/ver_40200_copy.root)
+                  COPY_TO_BUILDDIR files/ver_40200.root files/ver_40200_copy.root
+                  FIXTURES_SETUP root-tree-fastcloning-makeCloneTree-fixture)
 
 ROOTTEST_ADD_TEST(runcloneChain
                   MACRO runcloneChain.C
                   OUTREF references/runcloneChain.ref
-                  DEPENDS roottest-root-tree-fastcloning-make_CloneTree)
+                  FIXTURES_REQUIRED root-tree-fastcloning-makeCloneTree-fixture)

roottest/root/tree/index/CMakeLists.txt

@@ -1,7 +1,17 @@
-#-------------------------------------------------------------------------------
-#
-# 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()
+ROOTTEST_ADD_TEST(chain
+                  MACRO runchain.C
+                  OUTREF chain.ref)
+
+ROOTTEST_ADD_TEST(ChainIndex
+                  MACRO execChainIndex.cxx+
+                  COPY_TO_BUILDDIR abarton.1.root abarton.2.root abarton.3.root
+                  OUTREF execChainIndex.ref)
+
+ROOTTEST_ADD_TEST(Dupe
+                  MACRO runDupe.C
+                  OUTREF Dupe.ref)
+
+ROOTTEST_ADD_TEST(index64
+                  MACRO runindex64.C
+                  OUTREF index64.ref)
+

roottest/root/tree/index/runDupe.C

@@ -9,4 +9,6 @@ int runDupe()
   tree.Fill();
 
   tree.BuildIndex("run", "event");
+
+  return 0;
 }

roottest/root/tree/index/runchain.C

@@ -1,6 +1,7 @@
 #include "TFile.h"
 #include "TChain.h"
-#include "Riostream.h"
+
+#include <iostream>
 
 bool test(TTree*);
 
@@ -32,7 +33,7 @@ int runchain(){
   delete chain;
 
   return result;
-  
+
 }
 
 bool test(TTree *chain)

roottest/root/tree/interpreted/CMakeLists.txt

@@ -1,7 +1,3 @@
-#-------------------------------------------------------------------------------
-#
-# 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()
+ROOTTEST_ADD_TEST(friends
+                  MACRO macroFriends2.C
+                  OUTREF friends.ref)

roottest/root/tree/interpreted/friends.ref

@@ -0,0 +1,94 @@
+
+Processing macroFriends2.C...
+------MyClass::MyClass------
+------MyClass::CreateTrees------
+------MyClass::CreateTrees------
+------MyClass::AddTree------
+------MyClass::AddTree------
+------MyClass::AddTree------
+------MyClass::AddTree------
+------MyClass::AddTree------
+------MyClass::AddTree------
+------MyClass::AddTree------
+------MyClass::AddTree------
+------MyClass::CopyTrees1------
+nfriends(fTree) = 7
+nentries(fTree) = 100
+treej[0] = TreeX0
+treej[1] = TreeX1
+treej[2] = TreeX2
+treej[3] = TreeX3
+treej[4] = TreeY0
+treej[5] = TreeY1
+treej[6] = TreeY2
+treej[7] = TreeY3
+file = TreeZ1.root
+alias = TreeX0=TreeX0
+i= 0 j= 0  data= 0.61217
+i= 2 j= 0  data= 0.16907
+alias = TreeX1=TreeX1
+i= 0 j= 1  data= 0.481278
+i= 2 j= 1  data= 0.966759
+alias = TreeX2=TreeX2
+i= 0 j= 2  data= 0.0591071
+i= 2 j= 2  data= 0.308223
+alias = TreeX3=TreeX3
+i= 0 j= 3  data= 0.721412
+i= 2 j= 3  data= 0.660892
+alias = TreeY0=TreeY0
+i= 0 j= 4  data= 0.61217
+i= 2 j= 4  data= 0.16907
+alias = TreeY1=TreeY1
+i= 0 j= 5  data= 0.481278
+i= 2 j= 5  data= 0.966759
+alias = TreeY2=TreeY2
+i= 0 j= 6  data= 0.0591071
+i= 2 j= 6  data= 0.308223
+alias = TreeY3=TreeY3
+i= 0 j= 7  data= 0.721412
+i= 2 j= 7  data= 0.660892
+------MyClass::GetTree------
+fTreeName  = TreeX0
+fTreeTitle = trees
+nentries(tree) = 50
+nfriends(tree) = 7
+------MyClass::CopyTrees2------
+nfriends(fTree) = 7
+nentries(fTree) = 50
+treej[0] = TreeX0
+treej[1] = TreeX1
+treej[2] = TreeX2
+treej[3] = TreeX3
+treej[4] = TreeY0
+treej[5] = TreeY1
+treej[6] = TreeY2
+treej[7] = TreeY3
+file = TreeZ2.root
+tree[0]= TreeX0
+j= 0  x[0]= 0.61217
+j= 0  x[2]= 0.436059
+tree[1]= TreeX1
+j= 1  x[0]= 0.481278
+j= 1  x[2]= 0.416979
+tree[2]= TreeX2
+j= 2  x[0]= 0.0591071
+j= 2  x[2]= 0.207367
+tree[3]= TreeX3
+j= 3  x[0]= 0.721412
+j= 3  x[2]= 0.0777567
+tree[4]= TreeY0
+j= 4  x[0]= 0.61217
+j= 4  x[2]= 0.436059
+tree[5]= TreeY1
+j= 5  x[0]= 0.481278
+j= 5  x[2]= 0.416979
+tree[6]= TreeY2
+j= 6  x[0]= 0.0591071
+j= 6  x[2]= 0.207367
+tree[7]= TreeY3
+j= 7  x[0]= 0.721412
+j= 7  x[2]= 0.0777567
+------MyClass::GetTreeZ------
+nentries(treeZ) = 25
+nfriends(treeZ) = 7
+------MyClass::~MyClass------