rpms/cmake
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Disable curl test during bootstrap only

Browse Source
This commit is contained in:
Björn Esser 2020-05-30 14:19:55 +02:00
parent cfff94149b
commit 645a99bedd
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmake.spec
View File

@ -414,13 +414,17 @@ find %{buildroot}%{_bindir} -type f -or -type l -or -xtype l | \
mv -f Modules/FindLibArchive.cmake Modules/FindLibArchive.disabled mv -f Modules/FindLibArchive.cmake Modules/FindLibArchive.disabled
%endif %endif
pushd %{_vpath_builddir} pushd %{_vpath_builddir}
# CTestTestUpload, curl require internet access # CTestTestUpload require internet access
# CPackComponentsForAll-RPM-IgnoreGroup failing wih rpm 4.15 - https://gitlab.kitware.com/cmake/cmake/issues/19983 # CPackComponentsForAll-RPM-IgnoreGroup failing wih rpm 4.15 - https://gitlab.kitware.com/cmake/cmake/issues/19983
NO_TEST="CTestTestUpload|CPackComponentsForAll-RPM-IgnoreGroup|curl" NO_TEST="CTestTestUpload|CPackComponentsForAll-RPM-IgnoreGroup"
# kwsys.testProcess-{4,5} are flaky on s390x. # kwsys.testProcess-{4,5} are flaky on s390x.
%ifarch s390x %ifarch s390x
NO_TEST="$NO_TEST|kwsys.testProcess-4|kwsys.testProcess-5" NO_TEST="$NO_TEST|kwsys.testProcess-4|kwsys.testProcess-5"
%endif %endif
# curl test may fail during bootstrap
%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" --output-on-failure
# Keep an eye on failing tests # 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" --output-on-failure || :