From 42ed897ce1f05a07dbae3b7ab695fc6337e0fd4773161ff6452cff5e1665ffe0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Mon, 1 Sep 2014 08:23:28 +0000 Subject: [PATCH 1/2] - Add possible patch to fix random test failure * cmake-fix-module-loading-test.patch OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=173 --- cmake-fix-module-loading-test.patch | 11 +++++++++++ cmake.changes | 6 ++++++ cmake.spec | 7 ++++++- 3 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 cmake-fix-module-loading-test.patch diff --git a/cmake-fix-module-loading-test.patch b/cmake-fix-module-loading-test.patch new file mode 100644 index 0000000..6d599eb --- /dev/null +++ b/cmake-fix-module-loading-test.patch @@ -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) diff --git a/cmake.changes b/cmake.changes index 1eaced3..a7fe09d 100644 --- a/cmake.changes +++ b/cmake.changes @@ -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 diff --git a/cmake.spec b/cmake.spec index bf5978d..6f3803e 100644 --- a/cmake.spec +++ b/cmake.spec @@ -27,8 +27,10 @@ Source0: http://www.cmake.org/files/v3.0/%{name}-%{version}.tar.gz Source1: cmake.macros Source2: opensuse_rules.cmake 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 +# PATCH-FIX-UPSTREAM: tchvatal@suse.com failing test due to include order +Patch4: cmake-fix-module-loading-test.patch BuildRequires: curl-devel BuildRequires: fdupes BuildRequires: gcc-c++ @@ -50,6 +52,7 @@ CMake is a cross-platform, open-source build system %setup -q %patch2 -p1 %patch3 -p1 +%patch4 -p1 %build export CXXFLAGS="%{optflags}" @@ -87,6 +90,8 @@ sed -i \ # TestUpload: uses internet connection # SimpleInstall: seems to fail due to RPATH strictness # 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} \ -E "(TestUpload|SimpleInstall|SimpleInstall-Stage2)" From 855b52a6aecaa4494618f50ca25fc7ba0e114ca4537d9b0ea3c0b5d4b62b972e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Mon, 1 Sep 2014 08:23:49 +0000 Subject: [PATCH 2/2] OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=174 --- cmake.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/cmake.spec b/cmake.spec index 6f3803e..a94691a 100644 --- a/cmake.spec +++ b/cmake.spec @@ -90,8 +90,6 @@ sed -i \ # TestUpload: uses internet connection # SimpleInstall: seems to fail due to RPATH strictness # 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} \ -E "(TestUpload|SimpleInstall|SimpleInstall-Stage2)"