testing/cmake
SHA256
3
0
Fork 0
forked from pool/cmake
Code Pull Requests Activity

- Add possible patch to fix random test failure

Browse Source 
* cmake-fix-module-loading-test.patch

OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=173
This commit is contained in:
Tomáš Chvátal 2014-09-01 08:23:28 +00:00 committed by Git OBS Bridge
parent 303c3d7aff
commit 42ed897ce1
3 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cmake-fix-module-loading-test.patch Normal file
View File

@ -0,0 +1,11 @@
diff -urN cmake-3.0.1.old/Modules/FindCurses.cmake cmake-3.0.1/Modules/FindCurses.cmake
--- cmake-3.0.1.old/Modules/FindCurses.cmake 2014-09-01 10:01:38.114937449 +0200
+++ cmake-3.0.1/Modules/FindCurses.cmake 2014-09-01 10:02:53.134937440 +0200
@@ -39,6 +39,7 @@
find_library(CURSES_NCURSES_LIBRARY NAMES ncurses )
set(CURSES_USE_NCURSES FALSE)
+include(CheckLibraryExists)
if(CURSES_NCURSES_LIBRARY AND ((NOT CURSES_CURSES_LIBRARY) OR CURSES_NEED_NCURSES))
set(CURSES_USE_NCURSES TRUE)

6
cmake.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Sep 1 08:06:59 UTC 2014 - tchvatal@suse.com
- Add possible patch to fix random test failure
* cmake-fix-module-loading-test.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Aug 20 10:45:49 UTC 2014 - tchvatal@suse.com Wed Aug 20 10:45:49 UTC 2014 - tchvatal@suse.com

5
cmake.spec
View File

@ -29,6 +29,8 @@ Source2: opensuse_rules.cmake
Patch2: cmake-fix-ruby-test.patch Patch2: cmake-fix-ruby-test.patch
# PATCH-FIX-UPSTREAM dvaleev@suse.com https://github.com/Kitware/CMake/pull/111.patch # PATCH-FIX-UPSTREAM dvaleev@suse.com https://github.com/Kitware/CMake/pull/111.patch
Patch3: cmake-ppc64le-jni.patch Patch3: cmake-ppc64le-jni.patch
# PATCH-FIX-UPSTREAM: tchvatal@suse.com failing test due to include order
Patch4: cmake-fix-module-loading-test.patch
BuildRequires: curl-devel BuildRequires: curl-devel
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: gcc-c++ BuildRequires: gcc-c++
@ -50,6 +52,7 @@ CMake is a cross-platform, open-source build system
%setup -q %setup -q
%patch2 -p1 %patch2 -p1
%patch3 -p1 %patch3 -p1
%patch4 -p1
%build %build
export CXXFLAGS="%{optflags}" export CXXFLAGS="%{optflags}"
@ -87,6 +90,8 @@ sed -i \
# TestUpload: uses internet connection # TestUpload: uses internet connection
# SimpleInstall: seems to fail due to RPATH strictness # SimpleInstall: seems to fail due to RPATH strictness
# if any other app installs then this test is bogus # if any other app installs then this test is bogus
# FindModulesExecuteAll: randomly fails
# CMakeOnly.AllFindModules: randomly fails
./bin/ctest --force-new-ctest-process --output-on-failure %{?_smp_mflags} \ ./bin/ctest --force-new-ctest-process --output-on-failure %{?_smp_mflags} \
-E "(TestUpload|SimpleInstall|SimpleInstall-Stage2)" -E "(TestUpload|SimpleInstall|SimpleInstall-Stage2)"