Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion roottest/root/meta/autoloading/.rootrc

This file was deleted.

70 changes: 58 additions & 12 deletions roottest/root/meta/autoloading/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,19 +1,65 @@
ROOTTEST_GENERATE_REFLEX_DICTIONARY(classes classes.h SELECTION classes_selection.xml NO_ROOTMAP)
set(depends ${GENERATE_REFLEX_TEST})
ROOTTEST_ADD_TESTDIRS()

ROOTTEST_GENERATE_REFLEX_DICTIONARY(classes
classes.h
SELECTION classes_selection.xml
NO_ROOTMAP
FIXTURES_SETUP root-meta-autoloading-classes-fixture)

ROOTTEST_GENERATE_REFLEX_DICTIONARY(ROOT7114classes
ROOT7114classes.h
SELECTION ROOT7114classes_selection.xml
FIXTURES_SETUP root-meta-autoloading-ROOT7114classes-fixture)

ROOTTEST_GENERATE_REFLEX_DICTIONARY(TriggerTypeDefs
TriggerTypeDefs.h
SELECTION TriggerTypeDefs_selection.xml
FIXTURES_SETUP root-meta-autoloading-TriggerTypeDefs-fixture)

ROOTTEST_ADD_TEST(ROOT7114
MACRO assertROOT7114.C
OUTREF assertROOT7114.ref
FIXTURES_REQUIRED root-meta-autoloading-ROOT7114classes-fixture)

ROOTTEST_ADD_TEST(AutoLoadEntriesAsSelected
MACRO execAutoLoadEntriesAsSelected.C
OUTREF execAutoLoadEntriesAsSelected.ref)

ROOTTEST_GENERATE_REFLEX_DICTIONARY(ROOT7114classes ROOT7114classes.h SELECTION ROOT7114classes_selection.xml)
set(depends ${depends} ${GENERATE_REFLEX_TEST})
ROOTTEST_ADD_TEST(AutoloadOnInclusion
MACRO execAutoloadOnInclusion.C
COPY_TO_BUILDDIR aHeader.h aRootmap.rootmap
OUTREF execAutoloadOnInclusion.ref)

ROOTTEST_GENERATE_REFLEX_DICTIONARY(TriggerTypeDefs TriggerTypeDefs.h SELECTION TriggerTypeDefs_selection.xml)
set(depends ${depends} ${GENERATE_REFLEX_TEST})
ROOTTEST_ADD_TEST(execTriggerTypedefs
MACRO execTriggerTypedefs.C
OUTREF execTriggerTypedefs.ref
FIXTURES_REQUIRED root-meta-autoloading-TriggerTypeDefs-fixture)

ROOTTEST_ADD_TEST(typeDefAutoloading
MACRO exectypeDefAutoloading.C
COPY_TO_BUILDDIR exectypeDefAutoloading.rootmap
OUTREF exectypeDefAutoloading.ref
FIXTURES_REQUIRED root-meta-autoloading-classes-fixture)

ROOTTEST_ADD_TEST(Typeinfo
MACRO execTypeinfo.cxx+
OUTREF execTypeinfo.ref)

ROOTTEST_ADD_TEST(MissingEntriesROOT-5759
MACRO runFullMissingEntriesROOT-5759.C
COPY_TO_BUILDDIR MissingEntriesROOT-5759.rootmap
OUTREF MissingEntriesROOT-5759.ref)

#ROOTTEST_ADD_TEST(
# MACRO
# OUTREF .ref)

#---Copy from source to binary some of the files
configure_file(exectypeDefAutoloading.rootmap . COPYONLY)
configure_file(aRootmap.rootmap . COPYONLY)
configure_file(aHeader.h . COPYONLY)
#configure_file( . COPYONLY)
#configure_file( . COPYONLY)
#configure_file( . COPYONLY)

#--With ACLiC---------------------------------------------------------
set(execTypeinfo-suffix +)
#set(execTypeinfo-suffix +)

ROOTTEST_ADD_AUTOMACROS(DEPENDS ${depends})
ROOTTEST_ADD_TESTDIRS()
#ROOTTEST_ADD_AUTOMACROS(DEPENDS ${depends})
87 changes: 0 additions & 87 deletions roottest/root/meta/autoloading/Makefile

This file was deleted.

10 changes: 3 additions & 7 deletions roottest/root/meta/autoloading/MissingEntriesROOT-5759.ref
Original file line number Diff line number Diff line change
@@ -1,12 +1,8 @@

Processing runFullMissingEntriesROOT-5759.C...
1:10: fatal error: 'does_not_exist.h' file not found
input_line_27:1:10: fatal error: 'does_not_exist.h' file not found
#include "does_not_exist.h"
^~~~~~~~~~~~~~~~~~
2:6: error: expected ';' after expression
input_line_28:2:2: error: unknown type name 'cool'
cool d;
^
;
2:7: error: use of undeclared identifier 'd'
cool d;
^
^
1 change: 0 additions & 1 deletion roottest/root/meta/autoloading/NestedClasses/.rootrc

This file was deleted.

13 changes: 8 additions & 5 deletions roottest/root/meta/autoloading/NestedClasses/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,22 +1,25 @@
ROOTTEST_GENERATE_REFLEX_DICTIONARY(nestedTemplate
nestedTemplate.h
SELECTION sel1.xml)
SELECTION sel1.xml
FIXTURES_SETUP root-meta-autoloading-NestedClasses-dic1-fixture)

if(NOT MSVC OR win_broken_tests)
ROOTTEST_GENERATE_REFLEX_DICTIONARY(nestedTemplateClone
nestedTemplate_clone.h
SELECTION sel2.xml)
SELECTION sel2.xml
FIXTURES_SETUP root-meta-autoloading-NestedClasses-dic1-fixture)
endif()

ROOTTEST_ADD_TEST(nestedTemplate
MACRO execnestedTemplate.C
OUTREF nestedTemplate.ref
DEPENDS ${GENERATE_REFLEX_TEST})
FIXTURES_REQUIRED root-meta-autoloading-NestedClasses-dic1-fixture)

ROOTTEST_GENERATE_REFLEX_DICTIONARY(nestedClasses
nestedClasses.h
SELECTION nestedClasses_selection.xml)
SELECTION nestedClasses_selection.xml
FIXTURES_SETUP root-meta-autoloading-NestedClasses-dic2-fixture)
ROOTTEST_ADD_TEST(nestedClasses
MACRO execNestedClasses.C
OUTREF execNestedClasses${ref_suffix}
DEPENDS ${GENERATE_REFLEX_TEST})
FIXTURES_REQUIRED root-meta-autoloading-NestedClasses-dic2-fixture)
44 changes: 0 additions & 44 deletions roottest/root/meta/autoloading/NestedClasses/Makefile

This file was deleted.

26 changes: 17 additions & 9 deletions roottest/root/meta/autoloading/ROOT-12378/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,12 +1,20 @@
ROOTTEST_GENERATE_REFLEX_DICTIONARY(libatlas00 classes00.hh SELECTION sel00.xml)
set(depends ${GENERATE_REFLEX_TEST})
ROOTTEST_GENERATE_REFLEX_DICTIONARY(libatlas00
classes00.hh
SELECTION sel00.xml
FIXTURES_SETUP root-meta-autoloading-ROOT-12378-libatlas00-fixture)

ROOTTEST_GENERATE_REFLEX_DICTIONARY(libatlas01 classes01.hh SELECTION sel01.xml)
set(depends ${depends} ${GENERATE_REFLEX_TEST})
ROOTTEST_GENERATE_REFLEX_DICTIONARY(libatlas01
classes01.hh
SELECTION sel01.xml
FIXTURES_SETUP root-meta-autoloading-ROOT-12378-libatlas01-fixture)

ROOTTEST_GENERATE_REFLEX_DICTIONARY(libatlas02 classes02.hh SELECTION sel02.xml)
set(depends ${depends} ${GENERATE_REFLEX_TEST})
ROOTTEST_GENERATE_REFLEX_DICTIONARY(libatlas02
classes02.hh
SELECTION sel02.xml
FIXTURES_SETUP root-meta-autoloading-ROOT-12378-libatlas02-fixture)


ROOTTEST_ADD_AUTOMACROS(DEPENDS ${depends})
ROOTTEST_ADD_TESTDIRS()
ROOTTEST_ADD_TEST(testtypedef
MACRO exec_testtypedef.C
FIXTURES_REQUIRED root-meta-autoloading-ROOT-12378-libatlas00-fixture
root-meta-autoloading-ROOT-12378-libatlas01-fixture
root-meta-autoloading-ROOT-12378-libatlas02-fixture)
10 changes: 7 additions & 3 deletions roottest/root/meta/autoloading/ROOT-8432/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
ROOTTEST_GENERATE_REFLEX_DICTIONARY(cmswrapper cmswrapper.h SELECTION sel.xml)
set(depends ${GENERATE_REFLEX_TEST})
ROOTTEST_GENERATE_REFLEX_DICTIONARY(cmswrapper
cmswrapper.h
SELECTION sel.xml
FIXTURES_SETUP root-meta-autoloading-ROOT-8432-dic-fixture)

ROOTTEST_ADD_AUTOMACROS(DEPENDS ${depends})
ROOTTEST_ADD_TEST(cmsWrapper
MACRO execcmsWrapper.C
FIXTURES_REQUIRED root-meta-autoloading-ROOT-8432-dic-fixture)

1 change: 0 additions & 1 deletion roottest/root/meta/autoloading/classInNamespace/.rootrc

This file was deleted.

15 changes: 9 additions & 6 deletions roottest/root/meta/autoloading/classInNamespace/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
ROOTTEST_GENERATE_REFLEX_DICTIONARY(classInNamespace classInNamespace.h
ROOTTEST_GENERATE_REFLEX_DICTIONARY(classInNamespace
classInNamespace.h
SELECTION classInNamespace_selection.xml
LIBNAME libclassInNamespace_dictrflx
NO_ROOTMAP)
NO_ROOTMAP
FIXTURES_SETUP root-meta-autoloading-classInNamespace-dict-fixture)

#---Copy from source to binary some of the files
configure_file(classInNamespace.rootmap . COPYONLY)

ROOTTEST_ADD_AUTOMACROS(DEPENDS ${GENERATE_REFLEX_TEST})
ROOTTEST_ADD_TEST(ClassInNamespace
MACRO execClassInNamespace.C
OUTREF execClassInNamespace.ref
COPY_TO_BUILDDIR classInNamespace.rootmap
FIXTURES_REQUIRED root-meta-autoloading-classInNamespace-dict-fixture)

This file was deleted.

Loading
Loading