[Cmake-commits] CMake branch, next, updated. v2.8.7-3461-g5faeb09

Brad King brad.king at kitware.com
Mon Apr 16 08:49:31 EDT 2012


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  5faeb09806c0d4bf27a149f549410b8ac4a16be0 (commit)
       via  3247d63abbb0ed2c5aafcc14ef693db769eeb055 (commit)
       via  31e7fadbb3bfd225e0d48e2d072ccc745d7f2689 (commit)
       via  38ebdf0c33269a364901d6591aea6ac9f0d4e508 (commit)
       via  b4cb977f76d40e83540a06f4c60bfb2957b1b82c (commit)
      from  01460d545bc65d6dbd9eaaecc170e98f897b43fe (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5faeb09806c0d4bf27a149f549410b8ac4a16be0
commit 5faeb09806c0d4bf27a149f549410b8ac4a16be0
Merge: 01460d5 3247d63
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Apr 16 08:49:28 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Apr 16 08:49:28 2012 -0400

    Merge topic 'ctest_coverage-locale' into next
    
    3247d63 ctest_coverage: Save/restore LC_ALL around gcov (#13136)
    31e7fad KWSys Nightly Date Stamp
    38ebdf0 KWSys Nightly Date Stamp
    b4cb977 KWSys Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3247d63abbb0ed2c5aafcc14ef693db769eeb055
commit 3247d63abbb0ed2c5aafcc14ef693db769eeb055
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Apr 16 08:42:11 2012 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Apr 16 08:48:16 2012 -0400

    ctest_coverage: Save/restore LC_ALL around gcov (#13136)
    
    Commit ffbe61bb (make sure english is used for output of gcov, 2008-05-10)
    taught ctest_coverage to set LC_ALL=POSIX to get English output from gcov.
    Use the more portable value LC_ALL=C and restore the original value when
    finished.

diff --git a/Source/CTest/cmCTestCoverageHandler.cxx b/Source/CTest/cmCTestCoverageHandler.cxx
index 309abb1..ae06b0f 100644
--- a/Source/CTest/cmCTestCoverageHandler.cxx
+++ b/Source/CTest/cmCTestCoverageHandler.cxx
@@ -752,6 +752,33 @@ int cmCTestCoverageHandler::HandlePHPCoverage(
   return static_cast<int>(cont->TotalCoverage.size());
 }
 
+struct cmCTestCoverageHandlerLocale
+{
+  cmCTestCoverageHandlerLocale()
+    {
+    if(const char* l = cmSystemTools::GetEnv("LC_ALL"))
+      {
+      lc_all = l;
+      }
+    if(lc_all != "C")
+      {
+      cmSystemTools::PutEnv("LC_ALL=C");
+      }
+    }
+  ~cmCTestCoverageHandlerLocale()
+    {
+    if(!lc_all.empty())
+      {
+      cmSystemTools::PutEnv(("LC_ALL=" + lc_all).c_str());
+      }
+    else
+      {
+      cmSystemTools::UnsetEnv("LC_ALL");
+      }
+    }
+  std::string lc_all;
+};
+
 //----------------------------------------------------------------------
 int cmCTestCoverageHandler::HandleGCovCoverage(
   cmCTestCoverageHandlerContainer* cont)
@@ -815,7 +842,8 @@ int cmCTestCoverageHandler::HandleGCovCoverage(
   int file_count = 0;
 
   // make sure output from gcov is in English!
-  cmSystemTools::PutEnv("LC_ALL=POSIX");
+  cmCTestCoverageHandlerLocale locale_C;
+  static_cast<void>(locale_C);
 
   // files is a list of *.da and *.gcda files with coverage data in them.
   // These are binary files that you give as input to gcov so that it will

-----------------------------------------------------------------------

Summary of changes:
 Source/CTest/cmCTestCoverageHandler.cxx |   30 +++++++++++++++++++++++++++++-
 Source/kwsys/kwsysDateStamp.cmake       |    2 +-
 2 files changed, 30 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list