From 41c6af5b47c88d03310620f23d837e40e343b328 Mon Sep 17 00:00:00 2001
From: Bertrand Bellenot <Bertrand.Bellenot@cern.ch>
Date: Fri, 25 Nov 2022 08:55:49 +0100
Subject: [PATCH] [cmake] Disable tests failing on Windows with llvm13 (to be
reverted).
---
.../pyroot/pythonizations/test/CMakeLists.txt | 4 +-
cmake/modules/RootBuildOptions.cmake | 1 +
cmake/modules/SetUpWindows.cmake | 3 ++
core/thread/test/CMakeLists.txt | 6 ++-
test/CMakeLists.txt | 37 ++++++++++++-------
tmva/tmva/test/CMakeLists.txt | 6 ++-
tree/ntuple/v7/test/CMakeLists.txt | 4 +-
tutorials/CMakeLists.txt | 29 +++++++++++++++
8 files changed, 72 insertions(+), 18 deletions(-)
diff --git a/bindings/pyroot/pythonizations/test/CMakeLists.txt b/bindings/pyroot/pythonizations/test/CMakeLists.txt
index d002644e49c..d02cfa6a6d0 100644
--- a/bindings/pyroot/pythonizations/test/CMakeLists.txt
+++ b/bindings/pyroot/pythonizations/test/CMakeLists.txt
@@ -113,7 +113,9 @@ if (dataframe)
ROOT_ADD_PYUNITTEST(pyroot_pyz_rdataframe_makenumpy rdataframe_makenumpy.py PYTHON_DEPS numpy)
endif()
if(NOT MSVC OR win_broken_tests OR CMAKE_CXX_STANDARD GREATER 14)
- ROOT_ADD_PYUNITTEST(pyroot_pyz_rdataframe_asnumpy rdataframe_asnumpy.py PYTHON_DEPS numpy)
+ if(NOT MSVC OR ${LLVM_VERSION} VERSION_LESS 13.0.0 OR llvm13_broken_tests)
+ ROOT_ADD_PYUNITTEST(pyroot_pyz_rdataframe_asnumpy rdataframe_asnumpy.py PYTHON_DEPS numpy)
+ endif()
ROOT_ADD_PYUNITTEST(pyroot_pyz_rdataframe_histo_profile rdataframe_histo_profile.py)
endif()
endif()
diff --git a/cmake/modules/RootBuildOptions.cmake b/cmake/modules/RootBuildOptions.cmake
index fcf37b4e12c..7b8528f9c2b 100644
--- a/cmake/modules/RootBuildOptions.cmake
+++ b/cmake/modules/RootBuildOptions.cmake
@@ -191,6 +191,7 @@ ROOT_BUILD_OPTION(vdt ON "Enable support for VDT (fast and vectorisable mathemat
ROOT_BUILD_OPTION(veccore OFF "Enable support for VecCore SIMD abstraction library")
ROOT_BUILD_OPTION(vecgeom OFF "Enable support for VecGeom vectorized geometry library")
ROOT_BUILD_OPTION(win_broken_tests OFF "Enable broken tests on Windows")
+ROOT_BUILD_OPTION(llvm13_broken_tests OFF "Enable broken tests with LLVM 13 on Windows")
ROOT_BUILD_OPTION(winrtdebug OFF "Link against the Windows debug runtime library")
ROOT_BUILD_OPTION(x11 ON "Enable support for X11/Xft")
ROOT_BUILD_OPTION(xml ON "Enable support for XML (requires libxml2)")
diff --git a/cmake/modules/SetUpWindows.cmake b/cmake/modules/SetUpWindows.cmake
index 4abec6a414e..d58534395eb 100644
--- a/cmake/modules/SetUpWindows.cmake
+++ b/cmake/modules/SetUpWindows.cmake
@@ -45,6 +45,9 @@ elseif(MSVC)
if(win_broken_tests)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DR__ENABLE_BROKEN_WIN_TESTS")
endif()
+ if(llvm13_broken_tests)
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DR__ENABLE_LLVM13_BROKEN_TESTS")
+ endif()
else()
set(CMAKE_CXX_FLAGS "-nologo -FIw32pragma.h -FIsehmap.h ${BLDCXXFLAGS} -EHsc- -W3 -wd4244 -D_WIN32 ${ARCH}")
set(CMAKE_C_FLAGS "-nologo -FIw32pragma.h -FIsehmap.h ${BLDCFLAGS} -EHsc- -W3 -D_WIN32 ${ARCH}")
diff --git a/core/thread/test/CMakeLists.txt b/core/thread/test/CMakeLists.txt
index c135132d2a9..7d8f5494e9f 100644
--- a/core/thread/test/CMakeLists.txt
+++ b/core/thread/test/CMakeLists.txt
@@ -12,4 +12,8 @@ endif()
ROOT_ADD_GTEST(testTThreadedObject testTThreadedObject.cxx LIBRARIES Hist)
-ROOT_ADD_GTEST(testInterpreterLock testInterpreterLock.cxx LIBRARIES Imt REPEATS 50)
+if(NOT MSVC OR CMAKE_SIZEOF_VOID_P EQUAL 8 OR llvm13_broken_tests)
+ ROOT_ADD_GTEST(testInterpreterLock testInterpreterLock.cxx LIBRARIES Imt REPEATS 50)
+else()
+ ROOT_ADD_GTEST(testInterpreterLock testInterpreterLock.cxx LIBRARIES Imt REPEATS 40)
+endif()
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 63a546b276d..5a6e92ea401 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -134,9 +134,10 @@ ROOT_ADD_TEST(test-bench COMMAND bench -s LABELS longtest)
#--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
- FAILREGEX "FAILED|Error in"
-)
+if(NOT MSVC OR ${LLVM_VERSION} VERSION_LESS 13.0.0 OR llvm13_broken_tests)
+ ROOT_ADD_TEST(test-stressshapes-interpreted COMMAND ${ROOT_root_CMD} -b -q -l ${CMAKE_CURRENT_SOURCE_DIR}/stressShapes.cxx
+ FAILREGEX "FAILED|Error in")
+endif()
#--stressGeometry------------------------------------------------------------------------------------
ROOT_EXECUTABLE(stressGeometry stressGeometry.cxx LIBRARIES Geom Tree GenVector Gpad)
@@ -164,15 +165,19 @@ if(ROOT_opengl_FOUND)
endif()
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../tutorials/graphics/earth.dat earth.dat COPYONLY)
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" LABELS longtest)
- ROOT_ADD_TEST(test-stressgraphics-interpreted COMMAND ${ROOT_root_CMD} -b -q -l ${CMAKE_CURRENT_SOURCE_DIR}/stressGraphics.cxx
- FAILREGEX "FAILED|Error in" DEPENDS test-stressgraphics )
+ if(NOT MSVC OR ${LLVM_VERSION} VERSION_LESS 13.0.0 OR llvm13_broken_tests)
+ ROOT_ADD_TEST(test-stressgraphics-interpreted COMMAND ${ROOT_root_CMD} -b -q -l ${CMAKE_CURRENT_SOURCE_DIR}/stressGraphics.cxx
+ FAILREGEX "FAILED|Error in" DEPENDS test-stressgraphics )
+ endif()
endif()
#--stressHistogram------------------------------------------------------------------------------------
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
- FAILREGEX "FAILED|Error in" DEPENDS test-stresshistogram )
+if(NOT MSVC OR ${LLVM_VERSION} VERSION_LESS 13.0.0 OR llvm13_broken_tests)
+ ROOT_ADD_TEST(test-stresshistogram-interpreted COMMAND ${ROOT_root_CMD} -b -q -l ${CMAKE_CURRENT_SOURCE_DIR}/stressHistogram.cxx
+ FAILREGEX "FAILED|Error in" DEPENDS test-stresshistogram )
+endif()
#--stressGUI---------------------------------------------------------------------------------------
if(ROOT_asimage_FOUND)
@@ -266,8 +271,10 @@ if(ROOT_roofit_FOUND)
if(CUDA_FOUND)
ROOT_ADD_TEST(test-stressroostats-batchmode-cuda COMMAND stressRooStats -b cuda FAILREGEX "FAILED|Error in" LABELS longtest)
endif()
- ROOT_ADD_TEST(test-stressroostats-interpreted COMMAND ${ROOT_root_CMD} -b -q -l ${CMAKE_CURRENT_SOURCE_DIR}/stressRooStats.cxx
- FAILREGEX "FAILED|Error in" DEPENDS test-stressroostats )
+ if(NOT MSVC OR ${LLVM_VERSION} VERSION_LESS 13.0.0 OR llvm13_broken_tests)
+ ROOT_ADD_TEST(test-stressroostats-interpreted COMMAND ${ROOT_root_CMD} -b -q -l ${CMAKE_CURRENT_SOURCE_DIR}/stressRooStats.cxx
+ FAILREGEX "FAILED|Error in" DEPENDS test-stressroostats )
+ endif()
if (ROOT_minuit2_FOUND)
ROOT_ADD_TEST(test-stressroostats-minuit2 COMMAND stressRooStats -minim Minuit2 FAILREGEX "FAILED|Error in" LABELS longtest)
endif()
@@ -295,16 +302,20 @@ if(ROOT_unuran_FOUND)
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 CMAKE_SIZEOF_VOID_P EQUAL 4 OR win_broken_tests)
- ROOT_ADD_TEST(test-stresshistofit-interpreted COMMAND ${ROOT_root_CMD} -b -q -l ${CMAKE_CURRENT_SOURCE_DIR}/stressHistoFit.cxx
- FAILREGEX "FAILED|Error in" DEPENDS test-stresshistofit )
+ if(NOT MSVC OR ${LLVM_VERSION} VERSION_LESS 13.0.0 OR llvm13_broken_tests)
+ ROOT_ADD_TEST(test-stresshistofit-interpreted COMMAND ${ROOT_root_CMD} -b -q -l ${CMAKE_CURRENT_SOURCE_DIR}/stressHistoFit.cxx
+ FAILREGEX "FAILED|Error in" DEPENDS test-stresshistofit )
+ endif()
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
- FAILREGEX "FAILED|Error in" DEPENDS test-stressentrylist)
+if(NOT MSVC OR ${LLVM_VERSION} VERSION_LESS 13.0.0 OR llvm13_broken_tests)
+ ROOT_ADD_TEST(test-stressentrylist-interpreted COMMAND ${ROOT_root_CMD} -b -q -l ${CMAKE_CURRENT_SOURCE_DIR}/stressEntryList.cxx
+ FAILREGEX "FAILED|Error in" DEPENDS test-stressentrylist)
+endif()
#--stressIterators---------------------------------------------------------------------------
ROOT_EXECUTABLE(stressIterators stressIterators.cxx LIBRARIES Core)
diff --git a/tmva/tmva/test/CMakeLists.txt b/tmva/tmva/test/CMakeLists.txt
index 81122792f6f..6d1e9df8787 100644
--- a/tmva/tmva/test/CMakeLists.txt
+++ b/tmva/tmva/test/CMakeLists.txt
@@ -27,8 +27,10 @@ if(dataframe)
# RReader
ROOT_ADD_GTEST(rreader rreader.cxx LIBRARIES ROOTVecOps TMVA ROOTDataFrame)
# Tree inference system and user interface
- ROOT_ADD_GTEST(branchlessForest branchlessForest.cxx LIBRARIES TMVA)
- ROOT_ADD_GTEST(rbdt rbdt.cxx LIBRARIES ROOTVecOps TMVA)
+ if(NOT MSVC OR ${LLVM_VERSION} VERSION_LESS 13.0.0 OR llvm13_broken_tests)
+ ROOT_ADD_GTEST(branchlessForest branchlessForest.cxx LIBRARIES TMVA)
+ ROOT_ADD_GTEST(rbdt rbdt.cxx LIBRARIES ROOTVecOps TMVA)
+ endif()
endif()
if(dataframe AND NOT pyroot_legacy)
diff --git a/tree/ntuple/v7/test/CMakeLists.txt b/tree/ntuple/v7/test/CMakeLists.txt
index 6bf3fc5a3ac..0e7024f133e 100644
--- a/tree/ntuple/v7/test/CMakeLists.txt
+++ b/tree/ntuple/v7/test/CMakeLists.txt
@@ -35,7 +35,9 @@ ROOT_ADD_GTEST(ntuple_pages ntuple_pages.cxx LIBRARIES ROOTDataFrame ROOTNTuple
ROOT_ADD_GTEST(ntuple_print ntuple_print.cxx LIBRARIES ROOTDataFrame ROOTNTuple MathCore CustomStruct)
ROOT_ADD_GTEST(ntuple_rdf ntuple_rdf.cxx LIBRARIES ROOTDataFrame ROOTNTuple MathCore CustomStruct)
ROOT_ADD_GTEST(ntuple_serialize ntuple_serialize.cxx LIBRARIES ROOTDataFrame ROOTNTuple MathCore CustomStruct)
-ROOT_ADD_GTEST(ntuple_types ntuple_types.cxx LIBRARIES ROOTDataFrame ROOTNTuple MathCore CustomStruct)
+if(NOT MSVC OR ${LLVM_VERSION} VERSION_LESS 13.0.0 OR llvm13_broken_tests)
+ ROOT_ADD_GTEST(ntuple_types ntuple_types.cxx LIBRARIES ROOTDataFrame ROOTNTuple MathCore CustomStruct)
+endif()
ROOT_ADD_GTEST(ntuple_view ntuple_view.cxx LIBRARIES ROOTDataFrame ROOTNTuple MathCore CustomStruct)
ROOT_ADD_GTEST(ntuple_zip ntuple_zip.cxx LIBRARIES ROOTDataFrame ROOTNTuple MathCore CustomStruct)
diff --git a/tutorials/CMakeLists.txt b/tutorials/CMakeLists.txt
index 9a7eb7cb082..64f0774a9f5 100644
--- a/tutorials/CMakeLists.txt
+++ b/tutorials/CMakeLists.txt
@@ -384,6 +384,35 @@ set(extra_veto
eve7/*.C
r/rootlogon.C)
+if(MSVC AND ${LLVM_VERSION} VERSION_GREATER_EQUAL 13.0.0 AND NOT llvm13_broken_tests)
+ list(APPEND extra_veto
+ dataframe/df002_dataModel.C
+ dataframe/df007_snapshot.C
+ dataframe/df016_vecOps.C
+ dataframe/df017_vecOpsHEP.C
+ fit/NumericalMinimization.C
+ fit/fit2.C
+ fit/fit2a.C
+ fit/fit2dHist.C
+ graphics/earth.C
+ graphs/motorcycle.C
+ math/multidimSampling.C
+ math/multivarGaus.C
+ tree/basic.C
+ unfold/testUnfold5b.C
+ unfold/testUnfold5c.C
+ unfold/testUnfold5d.C
+ unuran/unuranDemo.C
+ v7/ntuple/ntpl001_staff.C
+ v7/perfcomp.cxx
+ dataframe/df002_dataModel.py
+ dataframe/df016_vecOps.py
+ dataframe/df017_vecOpsHEP.py)
+ if(CMAKE_SIZEOF_VOID_P EQUAL 8)
+ list(APPEND extra_veto math/exampleFunction.py)
+ endif()
+endif()
+
set(all_veto hsimple.C
geom/geometry.C
${extra_veto}
--
GitLab