Skip to content
Snippets Groups Projects
Commit e17cd284 authored by Pere Mato Vila's avatar Pere Mato Vila
Browse files

Fix the dictionaries for GenVector, SMatrix. Changed regular expression to... 

Fix the dictionaries for GenVector, SMatrix. Changed regular expression to detect errors in tests (CMake)
parent 6f79e2cf
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
math/genvector/CMakeLists.txt
+ 3
− 2
View file @ e17cd284
...@@ -17,8 +17,9 @@ set(headers Math/Vector2D.h Math/Point2D.h ...@@ -17,8 +17,9 @@ set(headers Math/Vector2D.h Math/Point2D.h
set(headers32 Math/Vector2D.h Math/Point2D.h set(headers32 Math/Vector2D.h Math/Point2D.h
Math/Vector3D.h Math/Point3D.h Math/Vector4D.h) Math/Vector3D.h Math/Point3D.h Math/Vector4D.h)
ROOT_GENERATE_DICTIONARY(G__${libname} ${headers} ${headers32} MODULE ${libname} LINKDEF Math/LinkDef_GenVectorAll.h) ROOT_GENERATE_DICTIONARY(G__${libname} ${headers} MODULE ${libname} LINKDEF Math/LinkDef_GenVector.h)
ROOT_GENERATE_DICTIONARY(G__${libname}32 ${headers32} MODULE ${libname}32 LINKDEF Math/LinkDef_GenVector32.h)
ROOT_LINKER_LIBRARY(${libname} *.cxx G__${libname}.cxx LIBRARIES Core) ROOT_LINKER_LIBRARY(${libname} *.cxx G__${libname}.cxx G__${libname}32.cxx LIBRARIES Core)
ROOT_INSTALL_HEADERS() ROOT_INSTALL_HEADERS()
math/smatrix/CMakeLists.txt
+ 9
− 2
View file @ e17cd284
...@@ -11,8 +11,15 @@ ROOT_GENERATE_DICTIONARY(G__${libname} Math/SMatrix.h Math/SVector.h ...@@ -11,8 +11,15 @@ ROOT_GENERATE_DICTIONARY(G__${libname} Math/SMatrix.h Math/SVector.h
Math/SMatrix.h Math/SVector.h Math/SMatrix.h Math/SVector.h
Math/SMatrixDfwd.h Math/SMatrixFfwd.h Math/SMatrixDfwd.h Math/SMatrixFfwd.h
MODULE ${libname} MODULE ${libname}
LINKDEF LinkDefAll.h) LINKDEF LinkDef.h)
ROOT_LINKER_LIBRARY(${libname} G__${libname}.cxx LIBRARIES Core) ROOT_GENERATE_DICTIONARY(G__${libname}32 Math/SMatrix.h Math/SVector.h
Math/SMatrixDfwd.h Math/SMatrixFfwd.h
Math/SMatrix.h Math/SVector.h
Math/SMatrixDfwd.h Math/SMatrixFfwd.h
MODULE ${libname}32
LINKDEF LinkDefD32.h)
ROOT_LINKER_LIBRARY(${libname} G__${libname}.cxx G__${libname}32 LIBRARIES Core)
ROOT_INSTALL_HEADERS() ROOT_INSTALL_HEADERS()
test/CMakeLists.txt
+ 20
− 20
View file @ e17cd284
...@@ -98,43 +98,43 @@ ROOT_ADD_TEST(test-bench COMMAND bench) ...@@ -98,43 +98,43 @@ ROOT_ADD_TEST(test-bench COMMAND bench)
#--stress------------------------------------------------------------------------------------ #--stress------------------------------------------------------------------------------------
ROOT_EXECUTABLE(stress stress.cxx LIBRARIES Event Core Hist RIO Tree Gpad Postscript) ROOT_EXECUTABLE(stress stress.cxx LIBRARIES Event Core Hist RIO Tree Gpad Postscript)
ROOT_ADD_TEST(test-stress COMMAND stress -b FAILREGEX "FAILED") ROOT_ADD_TEST(test-stress COMMAND stress -b FAILREGEX "FAILED|Error in")
#--stressShapes------------------------------------------------------------------------------------ #--stressShapes------------------------------------------------------------------------------------
ROOT_EXECUTABLE(stressShapes stressShapes.cxx LIBRARIES Geom Tree GenVector Gpad) ROOT_EXECUTABLE(stressShapes stressShapes.cxx LIBRARIES Geom Tree GenVector Gpad)
ROOT_ADD_TEST(test-stressshapes COMMAND stressShapes -b FAILREGEX "FAILED") ROOT_ADD_TEST(test-stressshapes COMMAND stressShapes -b FAILREGEX "FAILED|Error in")
#--stressGeometry------------------------------------------------------------------------------------ #--stressGeometry------------------------------------------------------------------------------------
ROOT_EXECUTABLE(stressGeometry stressGeometry.cxx LIBRARIES Geom Tree GenVector Gpad) ROOT_EXECUTABLE(stressGeometry stressGeometry.cxx LIBRARIES Geom Tree GenVector Gpad)
ROOT_ADD_TEST(test-stressgeometry COMMAND stressGeometry -b FAILREGEX "FAILED") ROOT_ADD_TEST(test-stressgeometry COMMAND stressGeometry -b FAILREGEX "FAILED|Error in")
#--stressLinear------------------------------------------------------------------------------------ #--stressLinear------------------------------------------------------------------------------------
ROOT_EXECUTABLE(stressLinear stressLinear.cxx LIBRARIES Matrix Hist RIO) ROOT_EXECUTABLE(stressLinear stressLinear.cxx LIBRARIES Matrix Hist RIO)
ROOT_ADD_TEST(test-stresslinear COMMAND stressLinear FAILREGEX "FAILED") ROOT_ADD_TEST(test-stresslinear COMMAND stressLinear FAILREGEX "FAILED|Error in")
#--stressGraphics------------------------------------------------------------------------------------ #--stressGraphics------------------------------------------------------------------------------------
ROOT_EXECUTABLE(stressGraphics stressGraphics.cxx LIBRARIES Graf Gpad Postscript) ROOT_EXECUTABLE(stressGraphics stressGraphics.cxx LIBRARIES Graf Gpad Postscript)
configure_file(stressGraphics.ref stressGraphics.ref @COPY_ONLY) configure_file(stressGraphics.ref stressGraphics.ref @COPY_ONLY)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../tutorials/graphics/earth.dat earth.dat @COPY_ONLY) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../tutorials/graphics/earth.dat earth.dat @COPY_ONLY)
ROOT_ADD_TEST(test-stressgraphics ENVIRONMENT LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/lib:$ENV{LD_LIBRARY_PATH} COMMAND stressGraphics -b -k FAILREGEX "FAILED") ROOT_ADD_TEST(test-stressgraphics ENVIRONMENT LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/lib:$ENV{LD_LIBRARY_PATH} COMMAND stressGraphics -b -k FAILREGEX "FAILED|Error in")
#--stressHistogram------------------------------------------------------------------------------------ #--stressHistogram------------------------------------------------------------------------------------
ROOT_EXECUTABLE(stressHistogram stressHistogram.cxx LIBRARIES Hist RIO) ROOT_EXECUTABLE(stressHistogram stressHistogram.cxx LIBRARIES Hist RIO)
ROOT_ADD_TEST(test-stresshistogram COMMAND stressHistogram FAILREGEX "FAILED") ROOT_ADD_TEST(test-stresshistogram COMMAND stressHistogram FAILREGEX "FAILED|Error in")
#--stressGUI--------------------------------------------------------------------------------------- #--stressGUI---------------------------------------------------------------------------------------
ROOT_EXECUTABLE(stressGUI stressGUI.cxx LIBRARIES Gui Recorder GuiHtml ASImageGui) ROOT_EXECUTABLE(stressGUI stressGUI.cxx LIBRARIES Gui Recorder GuiHtml ASImageGui)
#---Cannot run GUI test in batch mode-------------------- #---Cannot run GUI test in batch mode--------------------
#configure_file(stressGUI.ref stressGUI.ref @COPY_ONLY) #configure_file(stressGUI.ref stressGUI.ref @COPY_ONLY)
#ROOT_ADD_TEST(test-stressgui COMMAND stressGUI -ref FAILREGEX "FAILED") #ROOT_ADD_TEST(test-stressgui COMMAND stressGUI -ref FAILREGEX "FAILED|Error in")
#--stressSpectrum---------------------------------------------------------------------------------- #--stressSpectrum----------------------------------------------------------------------------------
ROOT_EXECUTABLE(stressSpectrum stressSpectrum.cxx LIBRARIES Hist Spectrum Gpad) ROOT_EXECUTABLE(stressSpectrum stressSpectrum.cxx LIBRARIES Hist Spectrum Gpad)
ROOT_ADD_TEST(test-stressspectrum COMMAND stressSpectrum -b FAILREGEX "FAILED") ROOT_ADD_TEST(test-stressspectrum COMMAND stressSpectrum -b FAILREGEX "FAILED|Error in")
#--stressVector------------------------------------------------------------------------------------ #--stressVector------------------------------------------------------------------------------------
ROOT_EXECUTABLE(stressVector stressVector.cxx LIBRARIES Physics GenVector) ROOT_EXECUTABLE(stressVector stressVector.cxx LIBRARIES Physics GenVector)
ROOT_ADD_TEST(test-stressvector COMMAND stressVector FAILREGEX "FAILED") ROOT_ADD_TEST(test-stressvector COMMAND stressVector FAILREGEX "FAILED|Error in")
#--stressTMVA-------------------------------------------------------------------------------------- #--stressTMVA--------------------------------------------------------------------------------------
if(ROOT_tmva_FOUND) if(ROOT_tmva_FOUND)
...@@ -145,25 +145,25 @@ endif() ...@@ -145,25 +145,25 @@ endif()
#--stressMathMore---------------------------------------------------------------------------------- #--stressMathMore----------------------------------------------------------------------------------
if(ROOT_mathmore_FOUND) if(ROOT_mathmore_FOUND)
ROOT_EXECUTABLE(stressMathMore stressMathMore.cxx LIBRARIES MathMore) ROOT_EXECUTABLE(stressMathMore stressMathMore.cxx LIBRARIES MathMore)
ROOT_ADD_TEST(test-stressmathmore COMMAND stressMathMore FAILREGEX "FAILED") ROOT_ADD_TEST(test-stressmathmore COMMAND stressMathMore FAILREGEX "FAILED|Error in")
endif() endif()
#--stressMathCore---------------------------------------------------------------------------------- #--stressMathCore----------------------------------------------------------------------------------
ROOT_GENERATE_DICTIONARY(TrackMathCoreDictionary ${CMAKE_CURRENT_SOURCE_DIR}/TrackMathCore.h MODULE TrackMathCoreDictionary LINKDEF TrackMathCoreLinkDef.h) ROOT_GENERATE_DICTIONARY(TrackMathCoreDictionary ${CMAKE_CURRENT_SOURCE_DIR}/TrackMathCore.h MODULE TrackMathCoreDictionary LINKDEF TrackMathCoreLinkDef.h)
ROOT_LINKER_LIBRARY(TrackMathCoreDict TrackMathCoreDictionary.cxx LIBRARIES Core MathCore RIO GenVector) ROOT_LINKER_LIBRARY(TrackMathCoreDict TrackMathCoreDictionary.cxx LIBRARIES Core MathCore RIO GenVector)
ROOT_EXECUTABLE(stressMathCore stressMathCore.cxx LIBRARIES MathCore Hist RIO Tree GenVector) ROOT_EXECUTABLE(stressMathCore stressMathCore.cxx LIBRARIES MathCore Hist RIO Tree GenVector)
ROOT_ADD_TEST(test-stressmathcore COMMAND stressMathCore FAILREGEX "FAILED") ROOT_ADD_TEST(test-stressmathcore COMMAND stressMathCore FAILREGEX "FAILED|Error in")
#--stressRooFit---------------------------------------------------------------------------------- #--stressRooFit----------------------------------------------------------------------------------
if(ROOT_roofit_FOUND) if(ROOT_roofit_FOUND)
ROOT_EXECUTABLE(stressRooFit stressRooFit.cxx LIBRARIES RooFit) ROOT_EXECUTABLE(stressRooFit stressRooFit.cxx LIBRARIES RooFit)
ROOT_ADD_TEST(test-stressroofit COMMAND stressRooFit FAILREGEX "FAILED") ROOT_ADD_TEST(test-stressroofit COMMAND stressRooFit FAILREGEX "FAILED|Error in")
endif() endif()
#--stressRooStats---------------------------------------------------------------------------------- #--stressRooStats----------------------------------------------------------------------------------
if(ROOT_roofit_FOUND) if(ROOT_roofit_FOUND)
ROOT_EXECUTABLE(stressRooStats stressRooStats.cxx LIBRARIES RooStats) ROOT_EXECUTABLE(stressRooStats stressRooStats.cxx LIBRARIES RooStats)
ROOT_ADD_TEST(test-stressroostats COMMAND stressRooStats -f ${CMAKE_SOURCE_DIR}/test/stressRooStats_ref.root FAILREGEX "FAILED") ROOT_ADD_TEST(test-stressroostats COMMAND stressRooStats -f ${CMAKE_SOURCE_DIR}/test/stressRooStats_ref.root FAILREGEX "FAILED|Error in")
endif() endif()
#--stressHistFactory-------------------------------------------------------------------------------- #--stressHistFactory--------------------------------------------------------------------------------
...@@ -171,27 +171,27 @@ if(ROOT_roofit_FOUND) ...@@ -171,27 +171,27 @@ if(ROOT_roofit_FOUND)
if(ROOT_xml_FOUND) if(ROOT_xml_FOUND)
ROOT_EXECUTABLE(stressHistFactory stressHistFactory.cxx LIBRARIES RooStats HistFactory XMLParser) ROOT_EXECUTABLE(stressHistFactory stressHistFactory.cxx LIBRARIES RooStats HistFactory XMLParser)
file(COPY ${CMAKE_SOURCE_DIR}/test/HistFactoryTest.tar DESTINATION ${CMAKE_CURRENT_BINARY_DIR} ) file(COPY ${CMAKE_SOURCE_DIR}/test/HistFactoryTest.tar DESTINATION ${CMAKE_CURRENT_BINARY_DIR} )
ROOT_ADD_TEST(test-stressHistFactory ENVIRONMENT ROOTSYS=${CMAKE_BINARY_DIR} COMMAND stressHistFactory -f ${CMAKE_SOURCE_DIR}/test/stressHistFactory_ref.root FAILREGEX "FAILED") ROOT_ADD_TEST(test-stressHistFactory ENVIRONMENT ROOTSYS=${CMAKE_BINARY_DIR} COMMAND stressHistFactory -f ${CMAKE_SOURCE_DIR}/test/stressHistFactory_ref.root FAILREGEX "FAILED|Error in")
endif() endif()
endif() endif()
#--stressFit--------------------------------------------------------------------------------- #--stressFit---------------------------------------------------------------------------------
ROOT_EXECUTABLE(stressFit stressFit.cxx LIBRARIES MathCore Matrix) ROOT_EXECUTABLE(stressFit stressFit.cxx LIBRARIES MathCore Matrix)
ROOT_ADD_TEST(test-stressfit COMMAND stressFit FAILREGEX "FAILED") ROOT_ADD_TEST(test-stressfit COMMAND stressFit FAILREGEX "FAILED|Error in")
#--stressHistoFit----------------------------------------------------------------------------- #--stressHistoFit-----------------------------------------------------------------------------
if(ROOT_unuran_FOUND) if(ROOT_unuran_FOUND)
ROOT_EXECUTABLE(stressHistoFit stressHistoFit.cxx LIBRARIES MathCore Matrix Unuran Tree Gpad) ROOT_EXECUTABLE(stressHistoFit stressHistoFit.cxx LIBRARIES MathCore Matrix Unuran Tree Gpad)
ROOT_ADD_TEST(test-stresshistofit COMMAND stressHistoFit FAILREGEX "FAILED") ROOT_ADD_TEST(test-stresshistofit COMMAND stressHistoFit FAILREGEX "FAILED|Error in")
endif() endif()
#--stressEntryList--------------------------------------------------------------------------- #--stressEntryList---------------------------------------------------------------------------
ROOT_EXECUTABLE(stressEntryList stressEntryList.cxx LIBRARIES MathCore Tree Hist) ROOT_EXECUTABLE(stressEntryList stressEntryList.cxx LIBRARIES MathCore Tree Hist)
ROOT_ADD_TEST(test-stressentrylist COMMAND stressEntryList -b FAILREGEX "FAILED") ROOT_ADD_TEST(test-stressentrylist COMMAND stressEntryList -b FAILREGEX "FAILED|Error in")
#--stressIterators--------------------------------------------------------------------------- #--stressIterators---------------------------------------------------------------------------
ROOT_EXECUTABLE(stressIterators stressIterators.cxx LIBRARIES Core) ROOT_EXECUTABLE(stressIterators stressIterators.cxx LIBRARIES Core)
ROOT_ADD_TEST(test-stressiterators COMMAND stressIterators FAILREGEX "FAILED") ROOT_ADD_TEST(test-stressiterators COMMAND stressIterators FAILREGEX "FAILED|Error in")
#--stressInterpreter------------------------------------------------------------------------- #--stressInterpreter-------------------------------------------------------------------------
ROOT_EXECUTABLE(stressInterpreter stressInterpreter.cxx LIBRARIES Core) ROOT_EXECUTABLE(stressInterpreter stressInterpreter.cxx LIBRARIES Core)
...@@ -206,7 +206,7 @@ ROOT_ADD_TEST(test-stressinterpreter COMMAND stressInterpreter ...@@ -206,7 +206,7 @@ ROOT_ADD_TEST(test-stressinterpreter COMMAND stressInterpreter
#--stressHepix------------------------------------------------------------------------------- #--stressHepix-------------------------------------------------------------------------------
#ROOT_EXECUTABLE(stressHepix stressHepix.cxx LIBRARIES Core) #ROOT_EXECUTABLE(stressHepix stressHepix.cxx LIBRARIES Core)
#ROOT_ADD_TEST(test-stressHepix COMMAND stressHepix FAILREGEX "FAILED") #ROOT_ADD_TEST(test-stressHepix COMMAND stressHepix FAILREGEX "FAILED|Error in")
#--stressProof------------------------------------------------------------------------------- #--stressProof-------------------------------------------------------------------------------
if(NOT WIN32 AND ROOT_xrootd_FOUND) if(NOT WIN32 AND ROOT_xrootd_FOUND)
...@@ -216,7 +216,7 @@ if(NOT WIN32 AND ROOT_xrootd_FOUND) ...@@ -216,7 +216,7 @@ if(NOT WIN32 AND ROOT_xrootd_FOUND)
-h1 ${CMAKE_SOURCE_DIR}/files/h1 -event ${CMAKE_SOURCE_DIR}/files/event -h1 ${CMAKE_SOURCE_DIR}/files/h1 -event ${CMAKE_SOURCE_DIR}/files/event
-l /tmp/stressProof-%d.log -cleanlog -catlog -noprogress -l /tmp/stressProof-%d.log -cleanlog -catlog -noprogress
ENVIRONMENT PATH=${CMAKE_BINARY_DIR}/bin:$ENV{PATH} ENVIRONMENT PATH=${CMAKE_BINARY_DIR}/bin:$ENV{PATH}
FAILREGEX "FAILED") FAILREGEX "FAILED|Error in")
endif() endif()
#--testbits---------------------------------------------------------------------------------- #--testbits----------------------------------------------------------------------------------
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment