From db23a0d2ab6e132348d039206635ef04919f9806 Mon Sep 17 00:00:00 2001 From: Christoph Junghans Date: Aug 04 2020 15:07:34 +0000 Subject: increase timeout for s390x --- diff --git a/gromacs.spec b/gromacs.spec index 6d8b53e..ffd1799 100644 --- a/gromacs.spec +++ b/gromacs.spec @@ -47,6 +47,7 @@ Patch0: gromacs-dssp-path.patch # enable some test on aarch64 - https://redmine.gromacs.org/issues/2366 # bug#1558206 Patch1: gromacs-issue-2366.patch +Patch2: test_timeout.patch BuildRequires: gcc-c++ BuildRequires: cmake3 >= 3.4.3 BuildRequires: openblas-devel @@ -232,13 +233,14 @@ This package single and double precision binaries and libraries. %setup -q %{?SOURCE2:-a 2} -n gromacs-%{version}%{?_rc} %patch0 -p1 %patch1 -p1 +%patch2 -p1 install -Dpm644 %{SOURCE1} ./serial/docs/manual/gromacs.pdf # Delete bundled stuff so that it doesn't get used accidentally # Don't remove tinyxml2 as gromacs needs an old version to build # test, see: https://redmine.gromacs.org/issues/2389 rm -r src/external/{fftpack,tng_io,lmfit} -sed -i 's/set(_timeout [0-9]*)/set(_timeout 900)/' src/testutils/TestMacros.cmake +sed -i 's/set(_timeout [0-9]*)/set(_timeout 9000)/' src/testutils/TestMacros.cmake %build # Default options, used for all compilations diff --git a/test_timeout.patch b/test_timeout.patch new file mode 100644 index 0000000..0d3f336 --- /dev/null +++ b/test_timeout.patch @@ -0,0 +1,10 @@ +--- gromacs-2019.6/tests/CMakeLists.txt.orig 2020-08-04 09:01:31.281910583 -0600 ++++ gromacs-2019.6/tests/CMakeLists.txt 2020-08-04 09:03:24.506767821 -0600 +@@ -172,6 +172,7 @@ + #windows requires the command to be perl and not the script + COMMAND perl "${REGRESSIONTEST_PATH}/gmxtest.pl" ${subtest} ${ARGS}) + set_tests_properties(regressiontests/${subtest} PROPERTIES ++ TIMEOUT 9000 + ENVIRONMENT "PATH=${PATH}") + endforeach() + else()