Skip to content
Closed
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/aclic/.rootrc

This file was deleted.

1 change: 0 additions & 1 deletion roottest/root/aclic/global/.rootrc

This file was deleted.

3 changes: 0 additions & 3 deletions roottest/root/aclic/global/buildId.C

This file was deleted.

1 change: 0 additions & 1 deletion roottest/root/aclic/load/.rootrc

This file was deleted.

6 changes: 4 additions & 2 deletions roottest/root/aclic/load/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ ROOTTEST_ADD_TEST(autoload
COPY_TO_BUILDDIR theRootmap.rootmap
MACRO execautoload.C
OUTREF execautoload.ref
DEPENDS autoloadtest.C)
DEPENDS autoloadtest.C
FIXTURES_SETUP root-aclic-load-autoload-fixture)

if(NOT coverage)
ROOTTEST_ADD_TEST(reload
Expand All @@ -19,5 +20,6 @@ if(NOT MSVC OR win_broken_tests)
ROOTTEST_ADD_TEST(autoloadNamespace
MACRO execautoloadNamespace.C
OUTREF execautoloadNamespace.ref
DEPENDS MyClass.cxx autoload)
DEPENDS MyClass.cxx
FIXTURES_REQUIRED root-aclic-load-autoload-fixture)
endif()
1 change: 0 additions & 1 deletion roottest/root/aclic/misc/.rootrc

This file was deleted.

6 changes: 2 additions & 4 deletions roottest/root/aclic/misc/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
ROOTTEST_ADD_TEST(runrelpath
MACRO runrelpath.C
OUTREF relpath.ref
${WILLFAIL_ON_WIN32}
DEPENDS ${COMPILE_MACRO_TEST})
${WILLFAIL_ON_WIN32})

ROOTTEST_ADD_TEST(assertmyfun
MACRO assertmyfun.cxx+
OUTREF assertmyfun.ref
DEPENDS ${COMPILE_MACRO_TEST})
OUTREF assertmyfun.ref)

ROOTTEST_ADD_TEST(assertROOT7027
MACRO assertROOT7027.C
Expand Down
1 change: 0 additions & 1 deletion roottest/root/aclic/nolinkdep/.rootrc

This file was deleted.

53 changes: 52 additions & 1 deletion roottest/root/aclic/nolinkdep/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1 +1,52 @@
# ROOTTEST_ADD_TEST(link MACRO link.C MACROARG 1)
# building shared library with missing symbols does not work on windows
# probably one can manipulate linker flags via rootlogon.C script - as it done for Linux and Mac
if(MSVC AND NOT win_broken_tests)
return()
endif()

ROOTTEST_ADD_TEST(build1
MACRO link.C
PRECMD ${CMAKE_COMMAND} -E remove "script1_C.* script2_C.*"
COPY_TO_BUILDDIR single.C script.C script1.C script2.C rootlogon.C
FIXTURES_SETUP root-aclic-nolinkdep-build1-fixture)

ROOTTEST_ADD_TEST(single
MACRO ${CMAKE_CURRENT_BINARY_DIR}/single.C+
FIXTURES_REQUIRED root-aclic-nolinkdep-build1-fixture
FIXTURES_SETUP root-aclic-nolinkdep-single-fixture)


ROOTTEST_ADD_TEST(load1
MACRO ${CMAKE_CURRENT_BINARY_DIR}/script1.C+
FIXTURES_REQUIRED root-aclic-nolinkdep-build1-fixture
root-aclic-nolinkdep-single-fixture
FIXTURES_SETUP root-aclic-nolinkdep-load1-fixture)

ROOTTEST_ADD_TEST(load2
MACRO ${CMAKE_CURRENT_BINARY_DIR}/script2.C+
FIXTURES_REQUIRED root-aclic-nolinkdep-build1-fixture
root-aclic-nolinkdep-single-fixture
FIXTURES_SETUP root-aclic-nolinkdep-load2-fixture)
Comment on lines +1 to +29
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ROOTTEST_COMPILE_MACRO(single_C
# except that this is not yet support by COMPILE_MACRO
PRECMD ${CMAKE_COMMAND} -E remove "script1_C.* script2_C.*"
FIXTURES_SETUP root-aclic-nolinkdep-build1-single-fixture)

ROOTTEST_COMPILE_MACRO(script1_C
BUILDLIB single_C
FIXTURES_REQUIRED root-aclic-nolinkdep-build1-single-fixture
FIXTURES_SETUP root-aclic-nolinkdep-build1-script1-fixture)

ROOTTEST_COMPILE_MACRO(script2_C
BUILDLIB single_C script1_C
FIXTURES_REQUIRED root-aclic-nolinkdep-build1-single-fixture
FIXTURES_REQUIRED root-aclic-nolinkdep-build1-script1-fixture
FIXTURES_SETUP root-aclic-nolinkdep-build1-script2-fixture)

ROOTTEST_ADD_TEST(single
MACRO ${CMAKE_CURRENT_BINARY_DIR}/single.C+
FIXTURES_REQUIRED root-aclic-nolinkdep-build1-script2-fixture
FIXTURES_SETUP root-aclic-nolinkdep-single-fixture)


ROOTTEST_ADD_TEST(load2b
MACRO ${CMAKE_CURRENT_BINARY_DIR}/script2.C+
FIXTURES_REQUIRED root-aclic-nolinkdep-load2-fixture
root-aclic-nolinkdep-single-fixture
FIXTURES_SETUP root-aclic-nolinkdep-load2b-fixture)

ROOTTEST_ADD_TEST(load1b
MACRO ${CMAKE_CURRENT_BINARY_DIR}/script1.C+
PRECMD ${CMAKE_COMMAND} -E remove "single_C.*"
OUTREF twoscript.ref
FIXTURES_REQUIRED root-aclic-nolinkdep-load1-fixture
root-aclic-nolinkdep-load2b-fixture
FIXTURES_SETUP root-aclic-nolinkdep-load1b-fixture)

ROOTTEST_ADD_TEST(build10
MACRO link.C
FIXTURES_REQUIRED root-aclic-nolinkdep-load1b-fixture
FIXTURES_SETUP root-aclic-nolinkdep-build10-fixture)

ROOTTEST_ADD_TEST(load10
MACRO ${CMAKE_CURRENT_BINARY_DIR}/script.C+
FIXTURES_REQUIRED root-aclic-nolinkdep-build10-fixture)
49 changes: 0 additions & 49 deletions roottest/root/aclic/nolinkdep/GNUMakefile

This file was deleted.

19 changes: 4 additions & 15 deletions roottest/root/aclic/nolinkdep/link.C
Original file line number Diff line number Diff line change
@@ -1,16 +1,5 @@
void link(int what) {
switch (what) {
case 1:
gROOT->ProcessLine(".L single.C+");
gROOT->ProcessLine(".L script1.C+");
gROOT->ProcessLine(".L script2.C+");
break;
case 10:
gROOT->ProcessLine(".L script.C+");
gSystem->CopyFile("script2.C","script.C");
gROOT->ProcessLine(".L script.C+");
break;
default:
break;
}
void link() {
gROOT->ProcessLine(".L single.C+");
gSystem->CopyFile("script2.C","script.C");
gROOT->ProcessLine(".L script.C+");
}
1 change: 0 additions & 1 deletion roottest/root/aclic/offset/.rootrc

This file was deleted.

15 changes: 14 additions & 1 deletion roottest/root/aclic/offset/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1 +1,14 @@
ROOTTEST_COMPILE_MACRO(TOffset.cxx)
ROOTTEST_COMPILE_MACRO(TOffset.cxx
FIXTURES_SETUP root-aclic-offset-TOffset-fixture)

if(MSVC)
SET(_ref_name offsetwin.ref)
else()
SET(_ref_name offset.ref)
endif()

ROOTTEST_ADD_TEST(offset
MACRO runoffset.C
ROOTEXE_OPTS -e "(void)gROOT->ProcessLine(\".L TOffset.cxx+\")"
OUTREF ${_ref_name}
FIXTURES_REQUIRED root-aclic-offset-TOffset-fixture)
2 changes: 0 additions & 2 deletions roottest/root/aclic/offset/TOffset.cpp

This file was deleted.

Loading
Loading