[roottest] use cmake for io/rootcint tests, part 5

roottest/root/io/rootcint/CMakeLists.txt

@@ -1,7 +1,48 @@
-#-------------------------------------------------------------------------------
-#
-# 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_GENERATE_DICTIONARY(testDict
+                             test.h
+                             LINKDEF testLinkDef.h
+                             NO_ROOTMAP NO_CXXMODULE)
+
+ROOTTEST_COMPILE_MACRO(cltest.C
+                       FIXTURES_SETUP root-io-rootcint-cltest-fixture)
+
+ROOTTEST_ADD_TEST(cltest
+                  MACRO cltest.C+
+                  OUTREF cltest.ref
+                  FIXTURES_REQUIRED root-io-rootcint-cltest-fixture)
+
+ROOTTEST_ADD_TEST(TemplateExpr
+                  MACRO execTemplateExpr.C
+                  OUTREF execTemplateExpr.ref)
+
+ROOTTEST_COMPILE_MACRO(virtualbase.h
+                       FIXTURES_SETUP root-io-rootcint-virtualbase-fixture)
+
+ROOTTEST_ADD_TEST(nestedtemplate
+                  MACRO runnestedtemplate.C
+                  OUTREF nestedtemplate.ref)
+
+ROOTTEST_COMPILE_MACRO(templateKeyword.C
+                       FIXTURES_SETUP root-io-rootcint-templateKeyword-fixture)
+
+ROOTTEST_ADD_TEST(templateKeyword
+                  MACRO runtemplateKeyword.C
+                  OUTREF templateKeyword.ref
+                  FIXTURES_REQUIRED root-io-rootcint-templateKeyword-fixture)
+
+ROOTTEST_ADD_TEST(virtualbase
+                  MACRO runvirtualbase.C
+                  OUTREF virtualbase.ref
+                  FIXTURES_REQUIRED root-io-rootcint-virtualbase-fixture)
+
+ROOTTEST_GENERATE_DICTIONARY(weirdpair
+                             weirdpair.h
+                             LINKDEF weirdpair_LinkDef.h
+                             NO_ROOTMAP NO_CXXMODULE)
+
+ROOTTEST_GENERATE_DICTIONARY(foo
+                             foo.hh
+                             LINKDEF foo_linkdef.h
+                             NO_ROOTMAP NO_CXXMODULE)

roottest/root/io/rootcint/doubleconst/AlgClusterSRList.h

@@ -18,7 +18,7 @@ class AlgClusterSRList : public TObject
   std::map<CandStripHandle *,  AltCandStpProbHandle *> fLikelihoods2;
 
 
-  ClassDef(AlgClusterSRList,1)                // ClusterSRList Algorithm Class
+  ClassDefOverride(AlgClusterSRList,1)                // ClusterSRList Algorithm Class
 };
 
 #endif                                                 // ALGCLUSTERSRLIST_H

roottest/root/io/rootcint/doubleconst/CMakeLists.txt

@@ -0,0 +1,6 @@
+ROOTTEST_GENERATE_DICTIONARY(CandCluster
+                             AlgClusterSRList.h CandStripHandle.h
+                             SOURCES AlgClusterSRList.cxx CandStripHandle.cxx
+                             LINKDEF LinkDef.h
+                             COMPILE_OPTIONS -DUNIX -DLINUX -D__UNIX__ -D__LINUX__ -DDATAREP_LITTLE_IEEE -DDATAREP_LITTLE_ENDIAN -DDEFECT_NO_IOSTREAM_NAMESPACES -DDEFECT_NO_JZEXT -DDEFECT_NO_INTHEX -DDEFECT_NO_INTHOLLERITH -DDEFECT_NO_READONLY -DDEFECT_NO_DIRECT_FIXED -DDEFECT_NO_STRUCTURE  -DUSE_ROOT
+                             NO_ROOTMAP NO_CXXMODULE)

roottest/root/io/rootcint/doubleconst/CandStripHandle.h

@@ -10,7 +10,7 @@ class CandStripHandle : public TObject
   CandStripHandle();
   virtual ~CandStripHandle();
 
-ClassDef(CandStripHandle,1)           // User access handle to CandStrip
+  ClassDefOverride(CandStripHandle,1)           // User access handle to CandStrip
 };
 
 #endif                                              // CANDSTRIPHANDLE_H

roottest/root/io/rootcint/foo.hh

@@ -1,5 +1,6 @@
-#include "TObject.h"
+#pragma once
 
+#include "TObject.h"
 
 namespace ns {
 

roottest/root/io/rootcint/nestedtemplate.ref

@@ -0,0 +1,2 @@
+
+Processing runnestedtemplate.C...

roottest/root/io/rootcint/runnestedtemplate.C

@@ -1,49 +1,54 @@
 #include "TNamed.h"
 
-template< class T1 > 
-class A { 
-   // ... 
-private: 
-   template< class T2 > 
-   class B  { 
-      T2 fValue; 
-   }; 
-   
-   template< class T2 > 
-   class C : public TNamed { 
-      T2 fValue; 
+template< class T1 >
+class A {
+   // ...
+private:
+   template< class T2 >
+   class B  {
+      T2 fValue;
+   };
+
+   template< class T2 >
+   class C : public TNamed {
+      T2 fValue;
       ClassDef(C,1);
-   }; 
-   
-   A<T1>::B< T1 > fMember3; 
-   A::B< T1 > fMember2; 
+   };
+
+   A<T1>::B< T1 > fMember3;
+   A::B< T1 > fMember2;
    B< T1 > fMember1;
    C<T1> fCMember1;
 
 };
 
-template< class T1 > 
-class TA : public TObject { 
-   // ... 
-private: 
-   template< class T2 > 
-   class B  { 
-      T2 fValue; 
-   }; 
-   
-   template< class T2 > 
-   class C : public TNamed { 
-      T2 fValue; 
+template< class T1 >
+class TA : public TObject {
+   // ...
+private:
+   template< class T2 >
+   class B  {
+      T2 fValue;
+   };
+
+   template< class T2 >
+   class C : public TNamed {
+      T2 fValue;
       ClassDef(C,1);
-   }; 
-   
-   TA<T1>::B< T1 > fMember3; 
-   TA::B< T1 > fMember2; 
+   };
+
+   TA<T1>::B< T1 > fMember3;
+   TA::B< T1 > fMember2;
    B< T1 > fMember1;
    C<T1> fCMember1;
-   
+
    ClassDef(TA,1);
 };
 
-A<short> a;
-TA<short> ta;
+void runnestedtemplate()
+{
+   A<short> a;
+   TA<short> ta;
+}
+
+

roottest/root/io/rootcint/sigbug/CMakeLists.txt

@@ -0,0 +1,21 @@
+set(CMAKE_ROOTTEST_DICT ON)
+set(CMAKE_ROOTTEST_NOROOTMAP ON)
+
+set(dictname Midad)
+
+ROOTTEST_TARGETNAME_FROM_FILE(GENERATE_DICTIONARY_TEST ${dictname})
+
+set(GENERATE_DICTIONARY_TEST ${GENERATE_DICTIONARY_TEST}-build)
+
+ROOT_GENERATE_DICTIONARY(${dictname}
+                         ${CMAKE_CURRENT_SOURCE_DIR}/Mint.h
+                         NO_CXXMODULE
+                         MODULE ${dictname}
+                         LINKDEF ${CMAKE_CURRENT_SOURCE_DIR}/LinkDef.h
+                         OPTIONS -DUNIX -DLINUX -D__UNIX__ -D__LINUX__ -DDATAREP_LITTLE_IEEE -DDATAREP_LITTLE_ENDIAN -DDEFECT_NO_IOSTREAM_NAMESPACES -DDEFECT_NO_JZEXT -DDEFECT_NO_INTHEX -DDEFECT_NO_INTHOLLERITH -DDEFECT_NO_READONLY -DDEFECT_NO_DIRECT_FIXED -DDEFECT_NO_STRUCTURE -DUSE_ROOT)
+
+add_test(NAME ${GENERATE_DICTIONARY_TEST}
+           COMMAND ${CMAKE_COMMAND} --build ${CMAKE_BINARY_DIR}
+                                    ${build_config}
+                                    --target ${dictname}${fast}
+                                    -- ${always-make})

roottest/root/io/rootcint/stl/CMakeLists.txt

@@ -0,0 +1,13 @@
+foreach(dict Safr test0 test1 test2)
+  ROOTTEST_GENERATE_DICTIONARY(${dict}
+                               ${dict}.h
+                               LINKDEF ${dict}LinkDef.h
+                               NO_ROOTMAP NO_CXXMODULE)
+endforeach()
+
+foreach(dict map1 map2)
+  ROOTTEST_GENERATE_DICTIONARY(${dict}
+                               ${dict}.C
+                               LINKDEF emptyLinkdef.h
+                               NO_ROOTMAP NO_CXXMODULE)
+endforeach()