[roottest] set build dir when compile macro

roottest/cling/offset/CMakeLists.txt

@@ -2,13 +2,18 @@ ROOTTEST_ADD_TEST(interpreted
                   MACRO runvbase.C
                   OUTREF vbase-i.out.ref
                   ERRREF vbase-i.err.ref
-                  LABELS roottest regression cling)
+                  LABELS roottest regression cling
+                  PRECMD ${CMAKE_COMMAND} -E remove -f ${CMAKE_CURRENT_BINARY_DIR}/runvbase_C${CMAKE_SHARED_LIBRARY_SUFFIX} ${CMAKE_CURRENT_BINARY_DIR}/runvbase_C_ACLiC_dict_rdict.pcm
+                  FIXTURES_SETUP cling-offset-runvbase-cling-fixture)
+
+ROOTTEST_COMPILE_MACRO(runvbase.C
+                       FIXTURES_REQUIRED cling-offset-runvbase-cling-fixture
+                       FIXTURES_SETUP cling-offset-runvbase-compile-fixture)
 
-ROOTTEST_COMPILE_MACRO(runvbase.C)
 ROOTTEST_ADD_TEST(compiled
                   MACRO runvbase.C+
                   OUTREF vbase-c.out.ref
                   ERRREF vbase-c.err.ref
                   LABELS roottest regression cling
-                  DEPENDS ${COMPILE_MACRO_TEST})
+                  FIXTURES_REQUIRED cling-offset-runvbase-compile-fixture)
 

roottest/cling/stl/map/CMakeLists.txt

@@ -1,19 +1,28 @@
 ROOTTEST_GENERATE_DICTIONARY(dict.C testing.C LINKDEF LinkDef.h)
 
+ROOTTEST_COMPILE_MACRO(MyOpClass.C
+                       FIXTURES_SETUP cling-stl-map-MyOpClass-fixtures)
+
+ROOTTEST_COMPILE_MACRO(MyClass.C
+                       FIXTURES_SETUP cling-stl-map-MyClass-fixtures)
+
+ROOTTEST_COMPILE_MACRO(stringMapLoad.cxx
+                       FIXTURES_SETUP cling-stl-map-stringMapLoad-fixtures)
+
 ROOTTEST_ADD_TEST(badOperator
                   MACRO badOperator.C
                   OUTREF badOperatorTest.ref
-                  DEPENDS MyOpClass.C
+                  FIXTURES_REQUIRED cling-stl-map-MyOpClass-fixtures
                   LABELS roottest regression cling)
 
 ROOTTEST_ADD_TEST(stringMap
                   MACRO stringMap.cxx
                   OUTREF stringMapTest.ref
-                  DEPENDS stringMapLoad.cxx
+                  FIXTURES_REQUIRED cling-stl-map-stringMapLoad-fixtures
                   LABELS roottest regression cling)
 
 ROOTTEST_ADD_TEST(badstringMap
                   MACRO badstringMap.cxx
                   OUTREF badstringMapTest.ref
-                  DEPENDS MyClass.C
+                  FIXTURES_REQUIRED cling-stl-map-stringMapLoad-fixtures cling-stl-map-MyClass-fixtures
                   LABELS roottest regression cling)

roottest/cling/template/CMakeLists.txt

@@ -1,14 +1,19 @@
+ROOTTEST_COMPILE_MACRO(longlong.C
+                       FIXTURES_SETUP cling-template-longlong-fixture)
+
 ROOTTEST_ADD_TEST(longlong
                   MACRO runlonglong.C
                   OUTREF longlong.ref
-                  DEPENDS longlong.C
+                  FIXTURES_REQUIRED cling-template-longlong-fixture
                   LABELS roottest regression cling)
 
+ROOTTEST_COMPILE_MACRO(Singleton.h
+                       FIXTURES_SETUP cling-template-Singleton-fixture)
 
 ROOTTEST_ADD_TEST(templateSingleton
                   MACRO runtemplateSingleton.C
                   OUTREF templateSingleton.ref
-                  DEPENDS Singleton.h
+                  FIXTURES_REQUIRED cling-template-Singleton-fixture
                   LABELS roottest regression cling)
 
 if(NOT ROOT_runtime_cxxmodules_FOUND)
@@ -17,31 +22,41 @@ endif()
 ROOTTEST_GENERATE_DICTIONARY(masterDict       master.h       LINKDEF masterLinkDef.h)
 ROOTTEST_GENERATE_DICTIONARY(forwardDict      forward.C      LINKDEF linkdef.h)
 ROOTTEST_GENERATE_DICTIONARY(constructorDict  constructor.hh LINKDEF linkdef.h)
-ROOTTEST_GENERATE_DICTIONARY(typenameTestDict typenameTest.C LINKDEF linkdef.h)
+ROOTTEST_GENERATE_DICTIONARY(typenameTestDict typenameTest.C LINKDEF linkdef.h
+                             FIXTURES_SETUP cling-template-typenameTestDict-fixture)
+
+ROOTTEST_COMPILE_MACRO(usingtemplate.C
+                       FIXTURES_SETUP cling-template-usingtemplate-fixture)
 
 ROOTTEST_ADD_TEST(runusingtemplate
                   MACRO runusingtemplate.C
                   OUTREF usingtemplate.ref
-                  DEPENDS usingtemplate.C
+                  FIXTURES_REQUIRED cling-template-usingtemplate-fixture
                   LABELS roottest regression cling)
 
+ROOTTEST_COMPILE_MACRO(templatefriend.cxx
+                       FIXTURES_SETUP cling-template-templatefriend-fixture)
+
 ROOTTEST_ADD_TEST(runtemplatefriend
                   MACRO runtemplatefriend.C
                   OUTREF templatefriend.ref
-                  DEPENDS templatefriend.cxx typenameTestDict-build
+                  FIXTURES_REQUIRED cling-template-templatefriend-fixture cling-template-typenameTestDict-fixture
                   LABELS roottest regression cling)
 
 ROOTTEST_ADD_TEST(interpreted
                   MACRO smalltest.C
+                  PRECMD ${CMAKE_COMMAND} -E remove -f ${CMAKE_CURRENT_BINARY_DIR}/smalltest_C${CMAKE_SHARED_LIBRARY_SUFFIX} ${CMAKE_CURRENT_BINARY_DIR}/smalltest_C_ACLiC_dict_rdict.pcm
+                  FIXTURES_SETUP cling-template-smalltest-interpreted-fixture
                   LABELS roottest regression cling)
 
 ROOTTEST_ADD_TEST(compiled
                   MACRO smalltest.C+
+                  FIXTURES_REQUIRED cling-template-smalltest-interpreted-fixture
                   LABELS roottest regression cling)
-                  
+
 ROOTTEST_ADD_TEST(defaultTemplateParam
                   MACRO execdefaultTemplateParam.cxx+
                   OUTREF execdefaultTemplateParam.ref
                   LABELS roottest regression cling)
-                  
+
 ROOTTEST_ADD_TESTDIRS()

roottest/cling/templateMembers/CMakeLists.txt

@@ -1,21 +1,64 @@
+ROOTTEST_COMPILE_MACRO(duplicate.C
+                       FIXTURES_SETUP cling-templateMembers-duplicate-fixture)
+
 ROOTTEST_ADD_TEST(runduplicate
                   MACRO runduplicate.C
                   OUTREF duplicate.ref
-                  DEPENDS duplicate.C
+                  FIXTURES_REQUIRED cling-templateMembers-duplicate-fixture
                   LABELS roottest regression cling)
 
+ROOTTEST_COMPILE_MACRO(operatorEqual.C
+                       FIXTURES_SETUP cling-templateMembers-operatorEqual-fixture)
+
 ROOTTEST_ADD_TEST(runoperatorEqual
                   MACRO runoperatorEqual.C
                   OUTREF_CINTSPECIFIC operatorEqual.ref
                   OUTCNVCMD grep -v FILE
                   OUTCNV runoperatorEqual_convert.sh
-                  DEPENDS operatorEqual.C
+                  FIXTURES_REQUIRED cling-templateMembers-operatorEqual-fixture
                   LABELS roottest regression cling)
 
+ROOTTEST_COMPILE_MACRO(constructor.C
+                       FIXTURES_SETUP cling-templateMembers-constructor-fixture)
+
 ROOTTEST_ADD_TEST(runConstructor
                   MACRO runConstructor.C
                   OUTREF templateConstructorTest.ref
-                  DEPENDS constructor.C
+                  FIXTURES_REQUIRED cling-templateMembers-constructor-fixture
                   LABELS roottest regression cling)
 
 ROOTTEST_GENERATE_DICTIONARY(opdict operator.C LINKDEF linkdef.h)
+
+ROOTTEST_GENERATE_DICTIONARY(libtemplateMembersDict
+                             templateMembersClasses.h
+                             LINKDEF templateMembersLinkdef.h
+                             NO_CXXMODULE
+                             FIXTURES_SETUP cling-templateMembers-libtemplateMembersDict-fixture)
+
+ROOTTEST_COMPILE_MACRO(templateMembers.C
+                       FIXTURES_REQUIRED cling-templateMembers-libtemplateMembersDict-fixture
+                       FIXTURES_SETUP cling-templateMembers-templateMembers-fixture)
+
+ROOTTEST_ADD_TEST(runtemplateMembers-interprter
+                  MACRO runtemplateMembers.C
+                  MACROARG false
+                  OUTCNVCMD grep -v -e "Processing" -e "Mem"
+                  PRECMD ${CMAKE_COMMAND} -E remove -f ${CMAKE_CURRENT_BINARY_DIR}/templateMembersCode_C${CMAKE_SHARED_LIBRARY_SUFFIX} ${CMAKE_CURRENT_BINARY_DIR}/templateMembersCode_C_ACLiC_dict_rdict.pcm
+                  FIXTURES_REQUIRED cling-templateMembers-templateMembers-fixture
+                                    cling-templateMembers-libtemplateMembersDict-fixture
+                  FIXTURES_SETUP cling-templateMembers-runtemplateMembers-interprter-fixture
+                  LABELS roottest regression cling)
+
+ROOTTEST_COMPILE_MACRO(templateMembersCode.C
+                        FIXTURES_REQUIRED cling-templateMembers-runtemplateMembers-interprter-fixture
+                                          cling-templateMembers-libtemplateMembersDict-fixture
+                        FIXTURES_SETUP cling-templateMembers-templateMembersCode-fixture)
+
+ROOTTEST_ADD_TEST(runtemplateMemberscompiled
+                  MACRO runtemplateMembers.C
+                  MACROARG true
+                  OUTCNVCMD grep -v -e "Processing" -e "Mem"
+                  FIXTURES_REQUIRED cling-templateMembers-templateMembers-fixture
+                                    cling-templateMembers-libtemplateMembersDict-fixture
+                                    cling-templateMembers-templateMembersCode-fixture
+                  LABELS roottest regression cling)

roottest/cling/templateMembers/templateMembersClasses.h

@@ -93,7 +93,7 @@ class my_shared_ptr {
       my_shared_ptr<T>& operator=(const my_shared_ptr<U>&) { SHOW; return *this; }
 
   template <class U>
-    my_shared_ptr<T>(const my_shared_ptr<U>&) { SHOW; } //rootcint can't find this
+    my_shared_ptr(const my_shared_ptr<U>&) { SHOW; } //rootcint can't find this
 
 /*   template <class U> */
 /*     my_shared_ptr<T>() { SHOW; } //rootcint can't find this */

roottest/cmake/modules/RoottestMacros.cmake

@@ -218,6 +218,7 @@ macro(ROOTTEST_COMPILE_MACRO filename)
         -e "gROOT->SetMacroPath(\"${CMAKE_CURRENT_SOURCE_DIR}\")"
         -e "gInterpreter->AddIncludePath(\"-I${CMAKE_CURRENT_BINARY_DIR}\")"
         -e "gSystem->AddIncludePath(\"-I${CMAKE_CURRENT_BINARY_DIR}\")"
+        -e "gSystem->SetBuildDir(\"${CMAKE_CURRENT_BINARY_DIR}\", true)"
         ${RootMacroDirDefines})
 
   set(root_compile_macro ${ROOT_root_CMD} ${RootMacroBuildDefines} -q -l -b)
@@ -280,21 +281,6 @@ macro(ROOTTEST_COMPILE_MACRO filename)
       FIXTURES_REQUIRED ${ARG_FIXTURES_REQUIRED})
   endif()
 
-  if(MSVC)
-    string(REPLACE "." "_" dll_name ${filename})
-    add_custom_command(TARGET ${compile_target} POST_BUILD
-       COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/${dll_name}.dll
-                                        ${CMAKE_CURRENT_BINARY_DIR}/
-       COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/${dll_name}_ACLiC_dict_rdict.pcm
-                                        ${CMAKE_CURRENT_BINARY_DIR}/
-       COMMAND ${CMAKE_COMMAND} -E remove -f ${CMAKE_CURRENT_SOURCE_DIR}/${dll_name}.d
-       COMMAND ${CMAKE_COMMAND} -E remove -f ${CMAKE_CURRENT_SOURCE_DIR}/${dll_name}.def
-       COMMAND ${CMAKE_COMMAND} -E remove -f ${CMAKE_CURRENT_SOURCE_DIR}/${dll_name}.dll
-       COMMAND ${CMAKE_COMMAND} -E remove -f ${CMAKE_CURRENT_SOURCE_DIR}/${dll_name}.exp
-       COMMAND ${CMAKE_COMMAND} -E remove -f ${CMAKE_CURRENT_SOURCE_DIR}/${dll_name}.lib
-       COMMAND ${CMAKE_COMMAND} -E remove -f ${CMAKE_CURRENT_SOURCE_DIR}/${dll_name}_ACLiC_dict_rdict.pcm)
-  endif()
-
 endmacro(ROOTTEST_COMPILE_MACRO)
 
 #-------------------------------------------------------------------------------