[roottest] Fix roottest trying to invoke /usr/bin/root.exe in tests.

graf2d/asimage/src/libAfterImage/CMakeLists.txt

@@ -27,11 +27,11 @@ set(FREETYPE_INCLUDE_DIR "" CACHE PATH "Path to Freetype include dir")
 set(ZLIB_INCLUDE_DIR "" CACHE PATH "Path to zlib include dir")
 
 if(NOT EXISTS "${FREETYPE_INCLUDE_DIR}/ft2build.h")
-  message(ERROR "Can't find ft2build.h in ${FREETYPE_INCLUDE_DIR}")
+  message(SEND_ERROR "Can't find ft2build.h in ${FREETYPE_INCLUDE_DIR}")
 endif()
 
 if(NOT EXISTS "${ZLIB_INCLUDE_DIR}/zlib.h")
-  message(ERROR "Can't find zlib.h in ${ZLIB_INCLUDE_DIR}")
+  message(SEND_ERROR "Can't find zlib.h in ${ZLIB_INCLUDE_DIR}")
 endif()
 
 INCLUDE_DIRECTORIES(${FREETYPE_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR})

roofit/roofit/test/vectorisedPDFs/CMakeLists.txt

@@ -48,7 +48,7 @@ ROOT_ADD_GTEST(testCBShape testCBShape.cxx
               LIBRARIES VectorisedPDFTests)
 ROOT_ADD_GTEST(testGamma testGamma.cxx
               LIBRARIES VectorisedPDFTests)
-if(ROOT_mathmore_FOUND)
+if(mathmore)
   ROOT_ADD_GTEST(testLegendre testLegendre.cxx
                 LIBRARIES VectorisedPDFTests ROOT::RooFitMore)
 endif()

roottest/CMakeLists.txt

@@ -1,5 +1,3 @@
-find_package(ROOT REQUIRED CONFIG)
-
 if(MSVC)
   set(CMAKE_SKIP_TEST_ALL_DEPENDENCY TRUE)
   set(CMAKE_SUPPRESS_REGENERATION TRUE)
@@ -53,12 +51,13 @@ else()
 
   # root-config --prefix helps to retrieve ROOTSYS env variable.
   # ROOT_BINDIR is set by ROOTConfig.cmake
-  find_program(ROOT_CONFIG_EXECUTABLE root-config PATHS ${ROOT_BINDIR})
-  if(NOT ROOT_CONFIG_EXECUTABLE)
-    message(ERROR "root-config is not found, please rerun configuration step.")
+  set(ROOT_CONFIG_EXECUTABLE ${ROOT_BINDIR}/root-config)
+  if(NOT EXISTS ${ROOT_CONFIG_EXECUTABLE})
+    message(FATAL_ERROR "root-config was not found in ${ROOT_CONFIG_EXECUTABLE}.")
+  endif()
+  if(NOT IS_DIRECTORY ${ROOTSYS})
+    message(FATAL_ERROR "ROOTSYS should be set before configuring roottest.")
   endif()
-  execute_process(COMMAND ${ROOT_CONFIG_EXECUTABLE} "--prefix" OUTPUT_VARIABLE ROOTSYS RESULT_VARIABLE RETVAR OUTPUT_STRIP_TRAILING_WHITESPACE)
-  set(ROOTSYS ${ROOTSYS} CACHE INTERNAL "")
   execute_process(COMMAND ${ROOT_CONFIG_EXECUTABLE} "--tutdir" OUTPUT_VARIABLE ROOT_TUTORIALS_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
   set(ROOT_LIBRARIES Core RIO Net Hist Gpad Tree Rint Matrix MathCore)
   set(ROOT_root_CMD ${ROOTSYS}/bin/root.exe)
@@ -116,19 +115,20 @@ endif()
 set(CMAKE_ROOTTEST_DICT ON)
 
 # Set the CMake module path. Here are all the custom CMake modules.
-set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH};${ROOT_SOURCE_DIR}/roottest/cmake/modules")
+list(APPEND CMAKE_MODULE_PATH "${ROOT_SOURCE_DIR}/roottest/cmake/modules")
 
 #---Set flag for PyROOT tests that are expected to fail
-if(ROOT_pyroot_FOUND)
+if(pyroot)
   set(PYTESTS_WILLFAIL WILLFAIL)
 endif()
 
 # Find OpenGL
 find_library(OPENGL_gl_LIBRARY NAMES GL)
 
-# Setup standard includes / links.
-include_directories(${ROOT_INCLUDE_DIRS} ${ROOT_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
-link_directories(${ROOT_LIBRARY_DIR})
+# Set global include dirs and library dirs for roottest.
+# These are picked up in the old-style dictionary generation and when standard CMake targets are created.
+include_directories(${ROOTSYS}/include ${CMAKE_CURRENT_SOURCE_DIR})
+link_directories(${ROOTSYS}/lib)
 set(CMAKE_MACOSX_RPATH TRUE)              # use RPATH for MacOSX
 
 include(RoottestCTest)

roottest/cling/functionTemplate/CMakeLists.txt

@@ -10,20 +10,12 @@ ROOTTEST_ADD_TEST(runreferenceuse
                   DEPENDS MyClassReferenceUse.C
                   LABELS roottest regression cling)
 
-if(ROOT_pyroot_FOUND)
+if(pyroot)
   ROOTTEST_ADD_TEST(testcint
                     MACRO testcint.py
                     PRECMD ${ROOT_root_CMD} -b -q -l -e .L\ t.h+
                     OUTREF pythoncintrun.ref
                     OUTCNVCMD grep -v "just a comment"
                     WORKING_DIR ${CMAKE_CURRENT_SOURCE_DIR}
                     LABELS roottest regression cling)
-
-  if(ROOT_cintex_FOUND)
-    ROOTTEST_ADD_TEST(testreflex
-                      MACRO testreflex.py
-                      OUTREF pythonreflexrun.ref
-                      OUTCNVCMD grep -v "just a comment"
-                      LABELS roottest regression cling)
-  endif()
 endif()

roottest/cling/parsing/ALICE-18972/CMakeLists.txt

@@ -1,4 +1,4 @@
-if(ROOT_geom_FOUND)
+if(geom)
   ROOTTEST_GENERATE_REFLEX_DICTIONARY(ALICE_18972 mylib.h SELECTION mylib_sel.xml)
 
   ROOTTEST_ADD_TEST(ALICE_18972

roottest/cling/template/CMakeLists.txt

@@ -16,7 +16,7 @@ ROOTTEST_ADD_TEST(templateSingleton
                   FIXTURES_REQUIRED cling-template-Singleton-fixture
                   LABELS roottest regression cling)
 
-if(NOT ROOT_runtime_cxxmodules_FOUND)
+if(NOT runtime_cxxmodules)
   ROOTTEST_GENERATE_DICTIONARY(slaveDict        slave.h        LINKDEF slaveLinkDef.h)
 endif()
 ROOTTEST_GENERATE_DICTIONARY(masterDict       master.h       NO_CXXMODULE LINKDEF masterLinkDef.h)

roottest/cmake/modules/SearchInstalledSoftwareRoottest.cmake

@@ -6,7 +6,7 @@ if(NOT MSVC)
 endif()
 
 #---Check for MPI---------------------------------------------------------------
-if(ROOT_mpi_FOUND)
+if(mpi)
   message(STATUS "Looking for MPI")
   find_package(MPI)
   if(NOT MPI_FOUND)

roottest/python/CMakeLists.txt

@@ -1,10 +1,10 @@
-if(ROOT_pyroot_FOUND)
+if(pyroot)
 
-  if(ROOT_roofit_FOUND)
+  if(roofit)
     set(roofit True)
   else()
     set(roofit False)
-  endif(ROOT_roofit_FOUND)
+  endif(roofit)
 
   find_python_module(pytest OPTIONAL)
 

roottest/python/JsMVA/CMakeLists.txt

@@ -1,4 +1,4 @@
-#if (ROOT_pyroot_FOUND AND NOT ROOT_CLASSIC_BUILD) # Do not run with classic build
+#if (pyroot AND NOT ROOT_CLASSIC_BUILD) # Do not run with classic build
 
 #set(NBDIFFUTIL ${CMAKE_CURRENT_SOURCE_DIR}/nbdiff.py )
 

roottest/python/JupyROOT/CMakeLists.txt

@@ -2,7 +2,7 @@
 if(NOT MSVC OR win_broken_tests)
 
 # Do not run with classic build or if tests are vetoed
-if (ROOT_pyroot_FOUND AND NOT ROOT_CLASSIC_BUILD)
+if (pyroot AND NOT ROOT_CLASSIC_BUILD)
 
 set(MODULES_LOCATION ${ROOTSYS}/lib/JupyROOT/helpers)
 set(NBDIFFUTIL ${CMAKE_CURRENT_SOURCE_DIR}/nbdiff.py )
@@ -38,7 +38,7 @@ foreach(NOTEBOOK ${NOTEBOOKS})
                     PYTHON_DEPS jupyter)
 endforeach()
 
-if(ROOT_imt_FOUND)
+if(imt)
   # No need to compare output here, just check it runs with no error
   set(IMT_NB Cpp_IMT_Canvas.ipynb)
   get_filename_component(NOTEBOOKBASE ${IMT_NB} NAME_WE)

roottest/python/basic/CMakeLists.txt

@@ -1,4 +1,4 @@
-if(ROOT_pyroot_FOUND)
+if(pyroot)
   ROOTTEST_ADD_TEST(basic
                     MACRO PyROOT_basictests.py
                     COPY_TO_BUILDDIR ArgumentPassingCompiled.C ReturnValues.C SimpleClass.C ArgumentPassingInterpreted.C

roottest/python/cling/CMakeLists.txt

@@ -1,4 +1,4 @@
-if(ROOT_pyroot_FOUND)
+if(pyroot)
   set(api_macro_file runPyAPITestCppyy.C) # Uses new Cppyy API
   ROOTTEST_ADD_TEST(api
                     MACRO ${api_macro_file}

roottest/python/cpp/CMakeLists.txt

@@ -1,4 +1,4 @@
-if(ROOT_pyroot_FOUND)
+if(pyroot)
 if(NOT MSVC OR win_broken_tests)
   ROOTTEST_ADD_TEST(cpp
                     MACRO PyROOT_cpptests.py

roottest/python/distrdf/CMakeLists.txt

@@ -1,8 +1,7 @@
 # Test only if:
 # * RDataFrame is available
 # * PyROOT is available
-if (ROOT_dataframe_FOUND AND
-    ROOT_pyroot_FOUND)
+if (dataframe AND pyroot)
 
     file(COPY test_headers DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
     file(COPY test_shared_libs DESTINATION ${CMAKE_CURRENT_BINARY_DIR})

roottest/python/distrdf/backends/CMakeLists.txt

@@ -1,13 +1,13 @@
-if(NOT ROOT_test_distrdf_dask_FOUND AND NOT ROOT_test_distrdf_pyspark_FOUND)
+if(NOT test_distrdf_dask AND NOT test_distrdf_pyspark)
     return()
 endif()
 
-if(ROOT_test_distrdf_dask_FOUND)
+if(test_distrdf_dask)
     list(APPEND DISTRDF_BACKENDS_IN_USE "dask")
     list(APPEND DISTRDF_RESOURCE_LOCKS "dask_resource_lock")
 endif()
 
-if(ROOT_test_distrdf_pyspark_FOUND)
+if(test_distrdf_pyspark)
 
     # Define environment variables needed in all pyspark tests
     set(PYSPARK_ENV_VARS PYSPARK_PYTHON=${Python3_EXECUTABLE})

roottest/python/function/CMakeLists.txt

@@ -1,4 +1,4 @@
-if(ROOT_pyroot_FOUND)
+if(pyroot)
   ROOTTEST_ADD_TEST(function
                     MACRO PyROOT_functiontests.py
                     COPY_TO_BUILDDIR InstallableFunction.C GlobalFunction.C GlobalFunction2.C GlobalFunction3.C

roottest/python/memory/CMakeLists.txt

@@ -1,4 +1,4 @@
-if(ROOT_pyroot_FOUND)
+if(pyroot)
   ROOTTEST_ADD_TEST(memory
                     MACRO PyROOT_memorytests.py
                     COPY_TO_BUILDDIR MemTester.C

roottest/python/numba/CMakeLists.txt

@@ -1,4 +1,4 @@
-if(ROOT_pyroot_FOUND)
+if(pyroot)
   if(NOT MSVC OR win_broken_tests)
     ROOTTEST_ADD_TEST(numba
                       MACRO PyROOT_numbatests.py)

roottest/python/pickle/CMakeLists.txt

@@ -1,4 +1,4 @@
-if(ROOT_pyroot_FOUND)
+if(pyroot)
   ROOTTEST_ADD_TEST(write
                     MACRO PyROOT_writetests.py
                     COPY_TO_BUILDDIR PickleTypes.C

roottest/python/pythonizations/CMakeLists.txt

@@ -1,4 +1,4 @@
-if(ROOT_pyroot_FOUND)
+if(pyroot)
   if(NOT MSVC OR "${CMAKE_GENERATOR_PLATFORM}" MATCHES "Win32" OR win_broken_tests)
     ROOTTEST_ADD_TEST(pythonizations
                       MACRO PyROOT_pythonizationtest.py

roottest/python/regression/CMakeLists.txt

@@ -1,4 +1,4 @@
-if(ROOT_pyroot_FOUND)
+if(pyroot)
   set(scott_file ScottCppyy.C) # Uses Cppyy header
 
 if(NOT MSVC OR win_broken_tests)

roottest/python/stl/CMakeLists.txt

@@ -1,4 +1,4 @@
-if(ROOT_pyroot_FOUND)
+if(pyroot)
   if(NOT MSVC OR win_broken_tests)
     ROOTTEST_ADD_TEST(stl
                       MACRO PyROOT_stltests.py

roottest/python/ttree/CMakeLists.txt

@@ -1,4 +1,4 @@
-if(ROOT_pyroot_FOUND)
+if(pyroot)
   ROOTTEST_ADD_TEST(ttree
                     MACRO PyROOT_ttreetests.py
                     COPY_TO_BUILDDIR TTreeTypes.C

roottest/root/multicore/CMakeLists.txt

@@ -24,7 +24,7 @@ endif()
 
 ROOTTEST_GENERATE_EXECUTABLE(testSetAddress
                              testSetAddress.cpp
-                             LIBRARIES Core MathCore RIO Tree GenVector Physics
+                             LIBRARIES Core MathCore RIO Tree TreePlayer GenVector Physics
                              FIXTURES_SETUP root-multicore-testSetAddress-fixture)
 
 if(MSVC)

roottest/root/ntuple/atlas-datavector/CMakeLists.txt

@@ -78,7 +78,7 @@ ROOTTEST_ADD_TEST(read
 # instantiation done by the Python bindings was leading to a faulty behaviour:
 # the user-provided class template "AtlasLikeDataVector<CustomStruct>" does not
 # correspond to what the compiler sees, so we need to inject this information.
-if(ROOT_pyroot_FOUND)
+if(pyroot)
     ROOT_ADD_PYUNITTEST(
         rentry_getptr
         rentry_getptr.py

roottest/root/roofitstats/CMakeLists.txt

@@ -1,4 +1,4 @@
-if(ROOT_roofit_FOUND)
+if(roofit)
 
   ROOTTEST_ADD_TEST(RooDataSet_ASCII_in
                     MACRO ${CMAKE_CURRENT_SOURCE_DIR}/ASCII-in-out.C