diff --git a/cmake-2.6.0-fix_ctest_coverage.patch b/cmake-2.6.0-fix_ctest_coverage.patch new file mode 100644 index 0000000..86f98b3 --- /dev/null +++ b/cmake-2.6.0-fix_ctest_coverage.patch @@ -0,0 +1,13 @@ +Subject: Fix CTest coverage xml generation. +Bugzilla: http://public.kitware.com/Bug/view.php?id=6988 +--- Source/CTest/cmCTestCoverageHandler.cxx ++++ Source/CTest/cmCTestCoverageHandler.cxx +@@ -538,7 +538,7 @@ int cmCTestCoverageHandler::ProcessHandl + covSumFile << "\tCTest->MakeXMLSafe(fileName) + << "\" FullPath=\"" << this->CTest->MakeXMLSafe( + this->CTest->GetShortPathToFile(fullFileName.c_str())) +- << "\" Covered=\"" << (tested==0?"true":"false") << "\">\n" ++ << "\" Covered=\"" << (tested > 0?"true":"false") << "\">\n" + << "\t\t" << tested << "\n" + << "\t\t" << untested << "\n" + << "\t\t"; diff --git a/cmake.changes b/cmake.changes index fda15e2..28f3533 100644 --- a/cmake.changes +++ b/cmake.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri May 9 10:11:57 CEST 2008 - dmueller@suse.de + +- fix ctest reporting (kitware#6988), patch by Andreas Schneider + ------------------------------------------------------------------- Tue May 6 22:48:24 CEST 2008 - dmueller@suse.de diff --git a/cmake.spec b/cmake.spec index 9a87f6f..1653ca6 100644 --- a/cmake.spec +++ b/cmake.spec @@ -13,7 +13,7 @@ Name: cmake Version: 2.6.0 -Release: 7 +Release: 9 License: BSD 3-Clause Group: Development/Tools/Building %define tar_version 2.6.0 @@ -35,6 +35,7 @@ Patch0: cmake-2.6.0-use_intree_xmlrpc.patch Patch1: cmake-2.4.7-less_verbosity.patch Patch2: cmake-2.6.0-use_shared_python_lib.patch Patch4: cmake-disable-builtin-chrpath.diff +Patch5: cmake-2.6.0-fix_ctest_coverage.patch Summary: Cross-platform, open-source make system Requires: make @@ -69,6 +70,7 @@ Authors: #%patch1 %patch2 %patch4 +%patch5 %build export CXXFLAGS="$RPM_OPT_FLAGS" @@ -119,6 +121,8 @@ rm -rf %{buildroot} /usr/share/pixmaps/CMakeSetup.png %changelog +* Fri May 09 2008 dmueller@suse.de +- fix ctest reporting (kitware#6988), patch by Andreas Schneider * Wed May 07 2008 dmueller@suse.de - update to 2.6.0: * Fix links in generated documentation