[roottest] adjust cmake for core tests

linev · linev · commit 05411102c704 · 2025-08-07T15:47:47.000+02:00
diff --git a/roottest/root/core/.rootrc b/roottest/root/core/.rootrc
diff --git a/roottest/root/core/CMakeLists.txt b/roottest/root/core/CMakeLists.txt
@@ -16,26 +16,23 @@ ROOTTEST_ADD_TEST(base64
                   MACRO  base64.C
                   OUTREF base64.ref)
 
-ROOTTEST_ADD_TEST(assertHumanReadable
+ROOTTEST_ADD_TEST(HumanReadable
                   MACRO assertHumanReadable.cxx+
-                  OUTREF assertHumanReadable.ref
-                  )
+                  OUTREF assertHumanReadable.ref)
 
-ROOTTEST_ADD_TEST(assertROOT7244
+ROOTTEST_ADD_TEST(ROOT7244
                   MACRO assertROOT7244.C
-                  COPY_TO_BUILDDIR subdir_ROOT7244/TheFile.h
-                  )
+                  COPY_TO_BUILDDIR subdir_ROOT7244/TheFile.h)
 
-ROOTTEST_ADD_TEST(assertROOT8542
-                  MACRO assertROOT8542.C
-                  )
+ROOTTEST_ADD_TEST(ROOT8542
+                  MACRO assertROOT8542.C)
 
 
 if(OPENGL_gl_LIBRARY AND ROOTTEST_OS_ID MATCHES Scientific|CentOS|Ubuntu|Fedora)
    set(ROOTTEST_ENV_EXTRA LD_PRELOAD=${OPENGL_gl_LIBRARY})
 endif()
 
-ROOTTEST_ADD_TEST(execStatusBitsCheck
+ROOTTEST_ADD_TEST(StatusBitsCheck
                   MACRO execStatusBitsCheck.C
                   OUTCNV convert.sh
                   OUTREF execStatusBitsCheck.ref)
diff --git a/roottest/root/core/base64.ref b/roottest/root/core/base64.ref
@@ -1,5 +1,5 @@
 
-Processing roottest/root/core/base64.C...
+Processing base64.C...
 base64: VGhpcyBpcyB0ZXN0IGJpbmFyeQ==
 base64: coding1 match
 base64: T3RoZXIgdGVzdCBzdHJpbmc=
diff --git a/roottest/root/core/execStatusBitsCheck.ref b/roottest/root/core/execStatusBitsCheck.ref
@@ -1,4 +1,4 @@
-Processing /Users/pcanal/root_working/roottest/root/core/execStatusBitsCheck.C...
+Processing execStatusBitsCheck.C...
 First verify verbose output in the case of TStreamerElement
 Bit   0 declared in TObject as kCanDelete
 Bit   3 declared in TObject as kMustCleanup
diff --git a/roottest/root/core/lifetime.ref b/roottest/root/core/lifetime.ref
@@ -1,2 +1,2 @@
 
-Processing roottest/root/core/lifetime.C...
+Processing lifetime.C...
diff --git a/roottest/root/core/recursive/CMakeLists.txt b/roottest/root/core/recursive/CMakeLists.txt
@@ -1,8 +1,11 @@
-ROOTTEST_GENERATE_EXECUTABLE(recursivewarning recursivewarning.cxx LIBRARIES Core)
+ROOTTEST_GENERATE_EXECUTABLE(recursivewarning
+                             recursivewarning.cxx
+                             LIBRARIES Core
+                             FIXTURES_SETUP root-core-recursive-recursivewarning-fixture)
+
 ROOTTEST_ADD_TEST(recursivewarning
                   EXEC ./recursivewarning
                   OUTREF test_recursivewarning.ref
-                  DEPENDS ${GENERATE_EXECUTABLE_TEST})
-
-configure_file(fakelib.rootmap . COPYONLY)
+                  COPY_TO_BUILDDIR fakelib.rootmap
+                  FIXTURES_REQUIRED root-core-recursive-recursivewarning-fixture)
 
diff --git a/roottest/root/core/stringView.ref b/roottest/root/core/stringView.ref
@@ -1,4 +1,4 @@
 
-Processing roottest/root/core/stringView.C...
+Processing stringView.C...
 asd
 Comparison with char[4] worked

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-Processing /Users/pcanal/root_working/roottest/root/core/execStatusBitsCheck.C...`
	`1`	`+Processing execStatusBitsCheck.C...`
`2`	`2`	`First verify verbose output in the case of TStreamerElement`
`3`	`3`	`Bit 0 declared in TObject as kCanDelete`
`4`	`4`	`Bit 3 declared in TObject as kMustCleanup`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`
`2`		`-Processing roottest/root/core/lifetime.C...`
	`2`	`+Processing lifetime.C...`