From 09828bfc472093911b2446e35df8a72ba489bbaf Mon Sep 17 00:00:00 2001 From: David Abdurachmanov Date: Mon, 10 Aug 2020 19:07:22 +0300 Subject: [PATCH] Increase timeout to 3000 seconds on riscv64 Signed-off-by: David Abdurachmanov --- cmake.spec | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/cmake.spec b/cmake.spec index 3bc1547..ddecf35 100644 --- a/cmake.spec +++ b/cmake.spec @@ -70,7 +70,7 @@ Name: %{orig_name}%{?name_suffix} Version: %{major_version}.%{minor_version}.1 -Release: %{baserelease}%{?relsuf}%{?dist} +Release: %{baserelease}%{?relsuf}.0.riscv64%{?dist} Summary: Cross-platform make system # most sources are BSD @@ -419,6 +419,11 @@ find %{buildroot}%{_bindir} -type f -or -type l -or -xtype l | \ mv -f Modules/FindLibArchive.cmake Modules/FindLibArchive.disabled %endif pushd %{_vpath_builddir} +# QEMU is slow thus a test timesout: +# 580 - Qt5Autogen.MocIncludeSymlink (Timeout) +%ifarch riscv64 +TEST_TIMEOUT="--test-timeout 3000" +%endif # CTestTestUpload require internet access # CPackComponentsForAll-RPM-IgnoreGroup failing wih rpm 4.15 - https://gitlab.kitware.com/cmake/cmake/issues/19983 NO_TEST="CTestTestUpload|CPackComponentsForAll-RPM-IgnoreGroup" @@ -430,9 +435,9 @@ NO_TEST="$NO_TEST|kwsys.testProcess-4|kwsys.testProcess-5" %if %{with bootstrap} NO_TEST="$NO_TEST|curl" %endif -bin/ctest%{?name_suffix} %{?_smp_mflags} -V -E "$NO_TEST" --output-on-failure +bin/ctest%{?name_suffix} %{?_smp_mflags} -V -E "$NO_TEST" $TEST_TIMEOUT --output-on-failure # Keep an eye on failing tests -bin/ctest%{?name_suffix} %{?_smp_mflags} -V -R "$NO_TEST" --output-on-failure || : +bin/ctest%{?name_suffix} %{?_smp_mflags} -V -R "$NO_TEST" $TEST_TIMEOUT --output-on-failure || : popd %if 0%{?rhel} && 0%{?rhel} <= 6 mv -f Modules/FindLibArchive.disabled Modules/FindLibArchive.cmake @@ -504,6 +509,9 @@ mv -f Modules/FindLibArchive.disabled Modules/FindLibArchive.cmake %changelog +* Mon Aug 10 2020 David Abdurachmanov - 3.18.1-1.0.riscv64 +- Increase timeout for tests to 3000 seconds on riscv64 + * Sat Aug 01 2020 Björn Esser - 3.18.1-1 - Update to 3.18.1