Skip to content

Commit 1ef2899

Browse files
committed
[roottest] use cmake for root/treedraw test
Use hsimple.C from tutorials directory Adjust hsimple.ps.ref file to used hsimple Remove rootlogon.C script and compile utils.cc macro directly Disable on Windows while utils.cc does not compiled there
1 parent 3cf3b64 commit 1ef2899

File tree

6 files changed

+1095
-410
lines changed

6 files changed

+1095
-410
lines changed

roottest/root/treedraw/.rootrc

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,16 @@
1-
#-------------------------------------------------------------------------------
2-
#
3-
# Placeholder file to translate the tests to the new CTest system. Meanwhile we
4-
# define a CTest test that calls 'make' in ${CMAKE_CURRENT_SOURCE_DIR}
5-
#
6-
#-------------------------------------------------------------------------------
7-
ROOTTEST_ADD_OLDTEST()
1+
if(NOT MSVC OR win_broken_tests)
2+
ROOTTEST_COMPILE_MACRO(${CMAKE_SOURCE_DIR}/roottest/scripts/utils.cc
3+
FIXTURES_SETUP root-treedraw-utils-fixture)
4+
5+
ROOTTEST_ADD_TEST(create
6+
MACRO ${CMAKE_SOURCE_DIR}/tutorials/hsimple.C
7+
PASSRC 255
8+
FIXTURES_SETUP root-treedraw-create-fixture)
9+
10+
ROOTTEST_ADD_TEST(simple
11+
MACRO runsimple.C
12+
ROOTEXE_OPTS -e "(void)gSystem->Load(\"utils_cc\")"
13+
COPY_TO_BUILDDIR hsimple.ps.ref
14+
OUTREF simple.ref
15+
FIXTURES_REQUIRED root-treedraw-utils-fixture root-treedraw-create-fixture)
16+
endif()

roottest/root/treedraw/Makefile

Lines changed: 0 additions & 56 deletions
This file was deleted.

roottest/root/treedraw/hsimple.C

Lines changed: 0 additions & 72 deletions
This file was deleted.

0 commit comments

Comments
 (0)