[CMake] Don't use find_package(ROOT REQUIRED) in test/ subdirectory

As Sergey said in the comment in `test/CMakeLists.txt`, this test
project stopped working standalone. But, it still uses
`find_package(ROOT)` to find ROOT, even though it's not installed yet as
we are building ROOT itself at the same time.

Apparently that works, and sets the flags like `ROOT_opengl_FOUND`, but
we should not rely on this and use the build-time configuration flags
instead.

Author: guitargeek

test/CMakeLists.txt

@@ -3,40 +3,11 @@
 #
 # For the licensing terms see $ROOTSYS/LICENSE.
 # For the list of contributors see $ROOTSYS/README/CREDITS.
-
-# CMakeLists.txt for the ROOT test programs.
-# This shows nicely how to compile and link applications
-# using the ROOT libraries on all supported platforms.
 #
 # Author: Pere Mato, 25/10/2010
-cmake_minimum_required(VERSION 3.10 FATAL_ERROR)
-
-project(test)
-
-# Sergey: make no sense while CMakeLists.txt file cannot be used separately from ROOT
-# but variables like ROOT_asimage_FOUND used here and produced in ROOTConfig.cmake
-find_package(ROOT REQUIRED)
-
-#---Copy the CTestCustom.cmake file into the build directory---------------------------------
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/CTestCustom.cmake ${CMAKE_CURRENT_BINARY_DIR} COPYONLY)
-enable_testing()
 
-if(CMAKE_SYSTEM_NAME MATCHES Darwin)
-  # To avoid to set ld_Library_path to locate the test libraries
-  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-rpath,@loader_path/.")
-endif()
-
-if(DEFINED ROOT_SOURCE_DIR)
-  # Testing using the binary tree
-  set(ROOT_root_CMD ${ROOT_BINDIR}/root.exe)
-  include_directories(${ROOT_SOURCE_DIR}/tutorials)
-else()
-  # Testing using an installation (assuming access to ROOT CMake modules)
-  include_directories(${ROOT_INCLUDE_DIRS})
-  include_directories(${ROOT_INCLUDE_DIRS}/../tutorials)
-  add_definitions(${ROOT_DEFINITIONS})
-  include(RootMacros)
-endif()
+# Testing using the binary tree
+set(root_exe $<TARGET_FILE:root.exe>)
 
 #---environment-------------------------------------------------------------------------------
 ROOT_ADD_TEST(show-environment COMMAND ${CMAKE_COMMAND} -E environment)
@@ -79,12 +50,12 @@ endif()
 #---invalid pointer checks---------------------------------------------------------------------
 if((NOT (APPLE AND CMAKE_SYSTEM_PROCESSOR MATCHES arm64) OR M1_BROKEN_TESTS) AND NOT experimental_adaptivecpp)
   ROOT_ADD_TEST(test-check-nullptr
-    COMMAND ${ROOT_root_CMD} -b -q -l --ptrcheck -e "int*ptr=(int*)0" -e "*ptr"
+    COMMAND ${root_exe} -b -q -l --ptrcheck -e "int*ptr=(int*)0" -e "*ptr"
     PASSREGEX "dereference null pointer")
 
   if(NOT MSVC OR win_broken_tests)
     ROOT_ADD_TEST(test-check-invalidptr
-      COMMAND ${ROOT_root_CMD} -b -q -l --ptrcheck -e "int*ptr=(int*)1" -e "*ptr"
+      COMMAND ${root_exe} -b -q -l --ptrcheck -e "int*ptr=(int*)1" -e "*ptr"
       PASSREGEX "invalid memory address")
   endif()
 endif()
@@ -95,7 +66,6 @@ ROOT_ADD_TEST(test-minexam COMMAND minexam)
 
 #--tstring-------------------------------------------------------------------------------------
 ROOT_EXECUTABLE(tstring tstring.cxx LIBRARIES Core)
-configure_file(tstring.cxx tstring.cxx COPYONLY)
 ROOT_ADD_TEST(test-tstring COMMAND tstring)
 
 #--tcollex-------------------------------------------------------------------------------------
@@ -129,7 +99,7 @@ ROOT_LINKER_LIBRARY(Aclock Aclock.cxx G__Aclock.cxx LIBRARIES Graf Gpad)
 #--bench------------------------------------------------------------------------------------
 ROOT_GENERATE_DICTIONARY(G__TBench ${CMAKE_CURRENT_SOURCE_DIR}/TBench.h MODULE TBench LINKDEF benchLinkDef.h DEPENDENCIES MathCore Tree)
 ROOT_LINKER_LIBRARY(TBench TBench.cxx G__TBench.cxx LIBRARIES Core MathCore RIO Tree)
-ROOT_EXECUTABLE(bench bench.cxx LIBRARIES Core TBench)
+ROOT_EXECUTABLE(bench bench.cxx LIBRARIES Core TBench RIO)
 ROOT_ADD_TEST(test-bench COMMAND bench -s LABELS longtest)
 
 #--stress------------------------------------------------------------------------------------
@@ -141,14 +111,14 @@ if(geom)
   #--stressShapes------------------------------------------------------------------------------------
   ROOT_EXECUTABLE(stressShapes stressShapes.cxx LIBRARIES  Geom Tree GenVector Gpad)
   ROOT_ADD_TEST(test-stressshapes COMMAND stressShapes -b FAILREGEX "FAILED|Error in")
-  ROOT_ADD_TEST(test-stressshapes-interpreted COMMAND ${ROOT_root_CMD} -b -q -l ${CMAKE_CURRENT_SOURCE_DIR}/stressShapes.cxx
+  ROOT_ADD_TEST(test-stressshapes-interpreted COMMAND ${root_exe} -b -q -l ${CMAKE_CURRENT_SOURCE_DIR}/stressShapes.cxx
                 FAILREGEX "FAILED|Error in")
 
   #--stressGeometry------------------------------------------------------------------------------------
   if (NOT MSVC) # Prevents the access to the web, which could happen through https
     ROOT_EXECUTABLE(stressGeometry stressGeometry.cxx LIBRARIES Geom Tree GenVector Gpad)
     ROOT_ADD_TEST(test-stressgeometry COMMAND stressGeometry -b FAILREGEX "FAILED|Error in" LABELS longtest)
-    ROOT_ADD_TEST(test-stressgeometry-interpreted COMMAND ${ROOT_root_CMD} -b -q -l ${CMAKE_CURRENT_SOURCE_DIR}/stressGeometry.cxx
+    ROOT_ADD_TEST(test-stressgeometry-interpreted COMMAND ${root_exe} -b -q -l ${CMAKE_CURRENT_SOURCE_DIR}/stressGeometry.cxx
                   FAILREGEX "FAILED|Error in" DEPENDS test-stressgeometry LABELS longtest)
   endif()
 endif()
@@ -157,11 +127,11 @@ endif()
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/linearIO.root ${CMAKE_CURRENT_BINARY_DIR} COPYONLY)
 ROOT_EXECUTABLE(stressLinear stressLinear.cxx LIBRARIES Matrix Hist RIO)
 ROOT_ADD_TEST(test-stresslinear COMMAND stressLinear FAILREGEX "FAILED|Error in" LABELS longtest)
-ROOT_ADD_TEST(test-stresslinear-interpreted COMMAND ${ROOT_root_CMD} -b -q -l ${CMAKE_CURRENT_SOURCE_DIR}/stressLinear.cxx
+ROOT_ADD_TEST(test-stresslinear-interpreted COMMAND ${root_exe} -b -q -l ${CMAKE_CURRENT_SOURCE_DIR}/stressLinear.cxx
               FAILREGEX "FAILED|Error in" LABELS longtest)
 
 #--stressGraphics------------------------------------------------------------------------------------
-if(ROOT_opengl_FOUND AND TARGET TreeViewer)
+if(opengl AND TARGET TreeViewer)
   ROOT_EXECUTABLE(stressGraphics stressGraphics.cxx LIBRARIES Graf Gpad Postscript TreeViewer HistPainter)
   if(MSVC)
     set_property(TARGET stressGraphics APPEND_STRING PROPERTY LINK_FLAGS "/STACK:4000000")
@@ -180,7 +150,7 @@ if(ROOT_opengl_FOUND AND TARGET TreeViewer)
                 FAILREGEX "FAILED|Error in"
                 LABELS longtest)
   ROOT_ADD_TEST(test-stressgraphics-interpreted
-                COMMAND ${ROOT_root_CMD} -b --web=off -q -l ${CMAKE_CURRENT_SOURCE_DIR}/stressGraphics.cxx
+                COMMAND ${root_exe} -b --web=off -q -l ${CMAKE_CURRENT_SOURCE_DIR}/stressGraphics.cxx
                 FAILREGEX "FAILED|Error in"
                 DEPENDS test-stressgraphics)
   ROOT_ADD_TEST(test-stressgraphics-svg
@@ -210,33 +180,33 @@ endif()
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/stressHistogram.5.18.00.root ${CMAKE_CURRENT_BINARY_DIR} COPYONLY)
 ROOT_EXECUTABLE(stressHistogram stressHistogram.cxx LIBRARIES Hist RIO)
 ROOT_ADD_TEST(test-stresshistogram COMMAND stressHistogram FAILREGEX "FAILED|Error in" LABELS longtest)
-ROOT_ADD_TEST(test-stresshistogram-interpreted COMMAND ${ROOT_root_CMD} -b -q -l ${CMAKE_CURRENT_SOURCE_DIR}/stressHistogram.cxx
+ROOT_ADD_TEST(test-stresshistogram-interpreted COMMAND ${root_exe} -b -q -l ${CMAKE_CURRENT_SOURCE_DIR}/stressHistogram.cxx
               FAILREGEX "FAILED|Error in")
 
 #--stressGUI---------------------------------------------------------------------------------------
-if(ROOT_asimage_FOUND)
+if(asimage)
   ROOT_EXECUTABLE(stressGUI stressGUI.cxx LIBRARIES Gui Recorder GuiHtml ASImageGui)
 endif()
 
 #--stressSpectrum----------------------------------------------------------------------------------
 if (spectrum)
   ROOT_EXECUTABLE(stressSpectrum stressSpectrum.cxx LIBRARIES Hist Spectrum Gpad)
   ROOT_ADD_TEST(test-stressspectrum COMMAND stressSpectrum -b FAILREGEX "FAILED|Error in" LABELS longtest)
-  ROOT_ADD_TEST(test-stressspectrum-interpreted COMMAND ${ROOT_root_CMD} -b -q -l ${CMAKE_CURRENT_SOURCE_DIR}/stressSpectrum.cxx
+  ROOT_ADD_TEST(test-stressspectrum-interpreted COMMAND ${root_exe} -b -q -l ${CMAKE_CURRENT_SOURCE_DIR}/stressSpectrum.cxx
                 FAILREGEX "FAILED|Error in" DEPENDS test-stressspectrum LABELS longtest)
 endif()
 
 #--stressVector------------------------------------------------------------------------------------
-ROOT_EXECUTABLE(stressVector stressVector.cxx LIBRARIES Physics GenVector)
+ROOT_EXECUTABLE(stressVector stressVector.cxx LIBRARIES Physics GenVector Smatrix)
 ROOT_ADD_TEST(test-stressvector COMMAND stressVector FAILREGEX "FAILED|Error in")
-ROOT_ADD_TEST(test-stressvector-interpreted COMMAND ${ROOT_root_CMD} -b -q -l ${CMAKE_CURRENT_SOURCE_DIR}/stressVector.cxx
+ROOT_ADD_TEST(test-stressvector-interpreted COMMAND ${root_exe} -b -q -l ${CMAKE_CURRENT_SOURCE_DIR}/stressVector.cxx
               FAILREGEX "FAILED|Error in" DEPENDS test-stressvector)
 
 #--stressMathMore----------------------------------------------------------------------------------
-if(ROOT_mathmore_FOUND)
+if(mathmore)
   ROOT_EXECUTABLE(stressMathMore stressMathMore.cxx LIBRARIES MathMore Smatrix)
   ROOT_ADD_TEST(test-stressmathmore COMMAND stressMathMore FAILREGEX "FAILED|Error in" LABELS longtest)
-  ROOT_ADD_TEST(test-stressmathmore-interpreted COMMAND ${ROOT_root_CMD} -b -q -l ${CMAKE_CURRENT_SOURCE_DIR}/stressMathMore.cxx
+  ROOT_ADD_TEST(test-stressmathmore-interpreted COMMAND ${root_exe} -b -q -l ${CMAKE_CURRENT_SOURCE_DIR}/stressMathMore.cxx
                 FAILREGEX "FAILED|Error in" DEPENDS test-stressmathmore TIMEOUT 1800)
 endif()
 
@@ -252,37 +222,37 @@ if(MSVC AND NOT CMAKE_GENERATOR MATCHES Ninja)
     COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/libTrackMathCoreDict.dll
                                      ${CMAKE_CURRENT_BINARY_DIR}/libTrackMathCoreDict.dll)
 endif()
-ROOT_EXECUTABLE(stressMathCore stressMathCore.cxx LIBRARIES MathCore Hist RIO Tree GenVector)
+ROOT_EXECUTABLE(stressMathCore stressMathCore.cxx LIBRARIES MathCore Hist RIO Tree GenVector Smatrix)
 ROOT_ADD_TEST(test-stressmathcore COMMAND stressMathCore FAILREGEX "FAILED|Error in" LABELS longtest)
-ROOT_ADD_TEST(test-stressmathcore-interpreted COMMAND ${ROOT_root_CMD} -b -q -l ${CMAKE_CURRENT_SOURCE_DIR}/stressMathCore.cxx
+ROOT_ADD_TEST(test-stressmathcore-interpreted COMMAND ${root_exe} -b -q -l ${CMAKE_CURRENT_SOURCE_DIR}/stressMathCore.cxx
               FAILREGEX "FAILED|Error in" DEPENDS test-stressmathcore)
 
 #--stressFit---------------------------------------------------------------------------------
 ROOT_EXECUTABLE(stressFit stressFit.cxx LIBRARIES MathCore Matrix)
 ROOT_ADD_TEST(test-stressfit COMMAND stressFit FAILREGEX "FAILED|Error in" LABELS longtest)
-ROOT_ADD_TEST(test-stressfit-interpreted COMMAND ${ROOT_root_CMD} -b -q -l ${CMAKE_CURRENT_SOURCE_DIR}/stressFit.cxx
+ROOT_ADD_TEST(test-stressfit-interpreted COMMAND ${root_exe} -b -q -l ${CMAKE_CURRENT_SOURCE_DIR}/stressFit.cxx
               FAILREGEX "FAILED|Error in" DEPENDS test-stressfit)
 
 #--stressHistoFit-----------------------------------------------------------------------------
-if(ROOT_unuran_FOUND)
+if(unuran)
   ROOT_EXECUTABLE(stressHistoFit stressHistoFit.cxx LIBRARIES MathCore Matrix Unuran Tree Gpad)
   ROOT_ADD_TEST(test-stresshistofit COMMAND stressHistoFit FAILREGEX "FAILED|Error in" LABELS longtest)
   if(NOT MSVC OR llvm13_broken_tests)
-    ROOT_ADD_TEST(test-stresshistofit-interpreted COMMAND ${ROOT_root_CMD} -b -q -l ${CMAKE_CURRENT_SOURCE_DIR}/stressHistoFit.cxx
+    ROOT_ADD_TEST(test-stresshistofit-interpreted COMMAND ${root_exe} -b -q -l ${CMAKE_CURRENT_SOURCE_DIR}/stressHistoFit.cxx
                   FAILREGEX "FAILED|Error in" DEPENDS test-stresshistofit )
   endif()
 endif()
 
 #--stressEntryList---------------------------------------------------------------------------
 ROOT_EXECUTABLE(stressEntryList stressEntryList.cxx LIBRARIES MathCore Tree Hist)
 ROOT_ADD_TEST(test-stressentrylist COMMAND stressEntryList -b FAILREGEX "FAILED|Error in")
-ROOT_ADD_TEST(test-stressentrylist-interpreted COMMAND ${ROOT_root_CMD} -b -q -l ${CMAKE_CURRENT_SOURCE_DIR}/stressEntryList.cxx
+ROOT_ADD_TEST(test-stressentrylist-interpreted COMMAND ${root_exe} -b -q -l ${CMAKE_CURRENT_SOURCE_DIR}/stressEntryList.cxx
               FAILREGEX "FAILED|Error in" DEPENDS test-stressentrylist)
 
 #--stressIterators---------------------------------------------------------------------------
 ROOT_EXECUTABLE(stressIterators stressIterators.cxx LIBRARIES Core)
 ROOT_ADD_TEST(test-stressiterators COMMAND stressIterators FAILREGEX "FAILED|Error in")
-ROOT_ADD_TEST(test-stressiterators-interpreted COMMAND ${ROOT_root_CMD} -b -q -l ${CMAKE_CURRENT_SOURCE_DIR}/stressIterators.cxx
+ROOT_ADD_TEST(test-stressiterators-interpreted COMMAND ${root_exe} -b -q -l ${CMAKE_CURRENT_SOURCE_DIR}/stressIterators.cxx
               FAILREGEX "FAILED|Error in" DEPENDS test-stressiterators)
 
 #--stressInterpreter-------------------------------------------------------------------------
@@ -319,10 +289,10 @@ ROOT_EXECUTABLE(threads threads.cxx LIBRARIES Thread Hist Gpad)
 
 #--stressIOPlugins--------------------------------------------------------------------------
 ROOT_EXECUTABLE(stressIOPlugins stressIOPlugins.cxx LIBRARIES Event Core Hist RIO Tree Gpad Postscript)
-if(ROOT_xrootd_FOUND)
+if(xrootd)
   ROOT_ADD_TEST(test-stressIOPlugins-xroot COMMAND stressIOPlugins root FAILREGEX "FAILED|Error in")
 endif()
-if(ROOT_davix_FOUND)
+if(davix)
   ROOT_ADD_TEST(test-stressIOPlugins-http COMMAND stressIOPlugins http FAILREGEX "FAILED|Error in")
 endif()
 
@@ -338,26 +308,26 @@ endif()
 ROOT_ADD_TEST(test-TFormulaTests COMMAND TFormulaTests FAILREGEX "FAILED|Error in")
 
 #--Vc basic test-----------------------------------------------------------------------------------
-if(ROOT_vc_FOUND)
+if(vc)
   ROOT_EXECUTABLE(testVc testVc.cxx LIBRARIES ${Vc_LIBRARIES} BUILTINS Vc)
   target_include_directories(testVc SYSTEM BEFORE PRIVATE ${Vc_INCLUDE_DIRS})
   ROOT_ADD_TEST(test-Vc COMMAND testVc FAILREGEX "FAILED|Error in")
 endif()
 
 #--VecCore basic test------------------------------------------------------------------------------
-if(ROOT_veccore_FOUND)
+if(veccore)
   ROOT_EXECUTABLE(test-veccore test-veccore.cxx LIBRARIES ${VecCore_LIBRARIES} BUILTINS VECCORE)
   target_include_directories(test-veccore BEFORE PRIVATE ${VecCore_INCLUDE_DIRS})
   target_compile_definitions(test-veccore PRIVATE ${VecCore_DEFINITIONS})
-  if(VecCore_Vc_FOUND)
+  if(veccore AND vc)
     ROOT_ADD_TEST(VecCore COMMAND test-veccore REGEX "Vc")
   else()
     ROOT_ADD_TEST(VecCore COMMAND test-veccore REGEX "Scalar")
   endif()
 endif()
 
 #--Vc GenVector test-----------------------------------------------------------------------------------
-if(ROOT_vc_FOUND)
+if(vc)
   ROOT_EXECUTABLE(testGenVectorVc testGenVectorVc.cxx LIBRARIES Physics GenVector ${Vc_LIBRARIES} BUILTINS Vc)
   target_include_directories(testGenVectorVc SYSTEM BEFORE PRIVATE ${Vc_INCLUDE_DIRS})
   ROOT_ADD_TEST(test-GenVector-Vc COMMAND testGenVectorVc FAILREGEX "FAILED|Error in")

test/stressHistoFit.cxx

@@ -86,7 +86,7 @@
 #include "Math/IFunction.h"
 #include "Math/IParamFunction.h"
 #include "TMath.h"
-#include "Math/DistFunc.h"
+#include "Math/PdfFuncMathCore.h"
 
 #include "TUnuran.h"
 #include "TUnuranMultiContDist.h"