110 lines
4.8 KiB
Diff
110 lines
4.8 KiB
Diff
From 4d09235937ea29913cbf9a9b5bcd002b52557c0e Mon Sep 17 00:00:00 2001
|
|
From: Mattias Ellert <mattias.ellert@physics.uu.se>
|
|
Date: Sun, 3 Jul 2022 08:18:57 +0200
|
|
Subject: [PATCH] Increase test timeout
|
|
|
|
---
|
|
cmake/modules/RootMacros.cmake | 14 +++++++-------
|
|
tmva/tmva/test/DNN/CMakeLists.txt | 2 +-
|
|
tree/tree/test/CMakeLists.txt | 2 +-
|
|
tutorials/CMakeLists.txt | 4 ++--
|
|
4 files changed, 11 insertions(+), 11 deletions(-)
|
|
|
|
diff --git a/cmake/modules/RootMacros.cmake b/cmake/modules/RootMacros.cmake
|
|
index cc61f4bbad..3e4559fc19 100644
|
|
--- a/cmake/modules/RootMacros.cmake
|
|
+++ b/cmake/modules/RootMacros.cmake
|
|
@@ -1779,6 +1779,7 @@ endfunction()
|
|
#----------------------------------------------------------------------------
|
|
# function ROOT_ADD_GTEST(<testsuite> source1 source2...
|
|
# [WILLFAIL] Negate output of test
|
|
+# [TIMEOUT seconds]
|
|
# [COPY_TO_BUILDDIR file1 file2] Copy listed files when ctest invokes the test.
|
|
# [LIBRARIES lib1 lib2...] -- Libraries to link against
|
|
# [LABELS label1 label2...] -- Labels to annotate the test
|
|
@@ -1790,7 +1791,7 @@ endfunction()
|
|
function(ROOT_ADD_GTEST test_suite)
|
|
cmake_parse_arguments(ARG
|
|
"WILLFAIL"
|
|
- "REPEATS;FAILREGEX"
|
|
+ "TIMEOUT;REPEATS;FAILREGEX"
|
|
"COPY_TO_BUILDDIR;LIBRARIES;LABELS;INCLUDE_DIRS" ${ARGN})
|
|
|
|
ROOT_GET_SOURCES(source_files . ${ARG_UNPARSED_ARGUMENTS})
|
|
@@ -1821,9 +1822,7 @@ function(ROOT_ADD_GTEST test_suite)
|
|
if(ARG_WILLFAIL)
|
|
set(willfail WILLFAIL)
|
|
endif()
|
|
- if(ARG_LABELS)
|
|
- set(labels "LABELS ${ARG_LABELS}")
|
|
- endif()
|
|
+
|
|
if(ARG_REPEATS)
|
|
set(extra_command --gtest_repeat=${ARG_REPEATS} --gtest_break_on_failure)
|
|
endif()
|
|
@@ -1833,10 +1832,11 @@ function(ROOT_ADD_GTEST test_suite)
|
|
gtest${mangled_name}
|
|
COMMAND ${test_suite} ${extra_command}
|
|
WORKING_DIR ${CMAKE_CURRENT_BINARY_DIR}
|
|
- COPY_TO_BUILDDIR ${ARG_COPY_TO_BUILDDIR}
|
|
+ COPY_TO_BUILDDIR "${ARG_COPY_TO_BUILDDIR}"
|
|
${willfail}
|
|
- ${labels}
|
|
- FAILREGEX ${ARG_FAILREGEX}
|
|
+ TIMEOUT "${ARG_TIMEOUT}"
|
|
+ LABELS "${ARG_LABELS}"
|
|
+ FAILREGEX "${ARG_FAILREGEX}"
|
|
)
|
|
endfunction()
|
|
|
|
diff --git a/tmva/tmva/test/DNN/CMakeLists.txt b/tmva/tmva/test/DNN/CMakeLists.txt
|
|
index a9233682f6..653540e9e3 100644
|
|
--- a/tmva/tmva/test/DNN/CMakeLists.txt
|
|
+++ b/tmva/tmva/test/DNN/CMakeLists.txt
|
|
@@ -144,7 +144,7 @@ ROOT_ADD_TEST(TMVA-DNN-MethodDL-SGD-Optimization-Cpu COMMAND testMethodDLSGDOpti
|
|
|
|
# DNN - MethodDL Adam Optimization CPU
|
|
ROOT_EXECUTABLE(testMethodDLAdamOptimizationCpu TestMethodDLAdamOptimizationCpu.cxx LIBRARIES ${Libraries})
|
|
-ROOT_ADD_TEST(TMVA-DNN-MethodDL-Adam-Optimization-Cpu COMMAND testMethodDLAdamOptimizationCpu)
|
|
+ROOT_ADD_TEST(TMVA-DNN-MethodDL-Adam-Optimization-Cpu COMMAND testMethodDLAdamOptimizationCpu TIMEOUT 1800)
|
|
|
|
# DNN - MethodDL Adagrad Optimization CPU
|
|
ROOT_EXECUTABLE(testMethodDLAdagradOptimizationCpu TestMethodDLAdagradOptimizationCpu.cxx LIBRARIES ${Libraries})
|
|
diff --git a/tree/tree/test/CMakeLists.txt b/tree/tree/test/CMakeLists.txt
|
|
index dbe664f8a0..6284e3c4c5 100644
|
|
--- a/tree/tree/test/CMakeLists.txt
|
|
+++ b/tree/tree/test/CMakeLists.txt
|
|
@@ -20,7 +20,7 @@ ROOT_ADD_GTEST(testBulkApi BulkApi.cxx LIBRARIES RIO Tree TreePlayer)
|
|
target_include_directories(testTOffsetGeneration PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
|
|
ROOT_STANDARD_LIBRARY_PACKAGE(SillyStruct NO_INSTALL_HEADERS HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/SillyStruct.h SOURCES SillyStruct.cxx LINKDEF SillyStructLinkDef.h DEPENDENCIES RIO)
|
|
ROOT_ADD_GTEST(testBulkApi BulkApi.cxx LIBRARIES RIO Tree TreePlayer)
|
|
-ROOT_ADD_GTEST(testBulkApiMultiple BulkApiMultiple.cxx LIBRARIES RIO Tree TreePlayer)
|
|
+ROOT_ADD_GTEST(testBulkApiMultiple BulkApiMultiple.cxx LIBRARIES RIO Tree TreePlayer TIMEOUT 3000)
|
|
ROOT_ADD_GTEST(testBulkApiVarLength BulkApiVarLength.cxx LIBRARIES RIO Tree TreePlayer)
|
|
ROOT_ADD_GTEST(testBulkApiSillyStruct BulkApiSillyStruct.cxx LIBRARIES RIO Tree TreePlayer SillyStruct)
|
|
ROOT_ADD_GTEST(testTBasket TBasket.cxx LIBRARIES RIO Tree)
|
|
diff --git a/tutorials/CMakeLists.txt b/tutorials/CMakeLists.txt
|
|
index 6ae9be5869..982432fe15 100644
|
|
--- a/tutorials/CMakeLists.txt
|
|
+++ b/tutorials/CMakeLists.txt
|
|
@@ -532,7 +532,7 @@ foreach(t ${tutorials})
|
|
|
|
# These tests on ARM64 need much more than 20 minutes - increase the timeout
|
|
if(ROOT_ARCHITECTURE MATCHES arm64 OR ROOT_ARCHITECTURE MATCHES ppc64)
|
|
- set(thisTestTimeout 2400) # 40m
|
|
+ set(thisTestTimeout 3000) # 50m
|
|
else()
|
|
set(thisTestTimeout 1200) # 20m
|
|
endif()
|
|
@@ -566,7 +566,7 @@ foreach(t ${mpi_tutorials})
|
|
|
|
# These tests on ARM64 need much more than 20 minutes - increase the timeout
|
|
if(ROOT_ARCHITECTURE MATCHES arm64 OR ROOT_ARCHITECTURE MATCHES ppc64)
|
|
- set(thisTestTimeout 2400) # 40m
|
|
+ set(thisTestTimeout 3000) # 50m
|
|
else()
|
|
set(thisTestTimeout 1200) # 20m
|
|
endif()
|
|
--
|
|
2.38.1
|
|
|