7add16520d
Drop patches accepted upstream: root-fix-ppc64le-compilation-with-gcc-10.patch root-ppc-codemodel.patch root-ppc-segfault-fix.patch Drop the doxygen generated root-doc package (doxygen runs out of memory) Backport python 3.11 fixes from upstream Various test fixes - patches from the rawhide build Don't use yuicompressor on Fedora (Java no longer available on ix86) Backport locking of gInterpreterMutex in TClingClassInfo::IsEnum
48 lines
2 KiB
Diff
48 lines
2 KiB
Diff
From bfa7b7e59c3bcee4d6a5501c800b49334af326e5 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
|
|
|
|
---
|
|
tmva/tmva/test/DNN/CMakeLists.txt | 2 +-
|
|
tutorials/CMakeLists.txt | 4 ++--
|
|
2 files changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
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/tutorials/CMakeLists.txt b/tutorials/CMakeLists.txt
|
|
index 520d682d2d..a846e7552f 100644
|
|
--- a/tutorials/CMakeLists.txt
|
|
+++ b/tutorials/CMakeLists.txt
|
|
@@ -479,7 +479,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()
|
|
@@ -513,7 +513,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.36.1
|
|
|