[Cmake-commits] CMake branch, next, updated. v2.8.12.2-1709-gd1b4aef

[Nils Gladitz]

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  d1b4aefb081b2885d7c2a48b0f1e393a8ea752e0 (commit)
       via  47e09e37a71bebded9d4a0abde14eabbb3a45354 (commit)
       via  cd8c797a8592cfae1894c5b81c70e011c1dd9490 (commit)
      from  228d02fc047671d764fe9d8b93b100eb1d8cfec8 (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=d1b4aefb081b2885d7c2a48b0f1e393a8ea752e0
commit d1b4aefb081b2885d7c2a48b0f1e393a8ea752e0
Merge: 228d02f 47e09e3
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Tue Feb 25 05:33:41 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Feb 25 05:33:41 2014 -0500

    Merge topic 'fix-showinclude-warnings' into next
    
    47e09e37 CTestLaunchers: exclude /showIncludes notes when scraping logs
    cd8c797a CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=47e09e37a71bebded9d4a0abde14eabbb3a45354
commit 47e09e37a71bebded9d4a0abde14eabbb3a45354
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Tue Feb 25 11:25:41 2014 +0100
Commit:     Nils Gladitz <nilsgladitz at gmail.com>
CommitDate: Tue Feb 25 11:25:41 2014 +0100

    CTestLaunchers: exclude /showIncludes notes when scraping logs
    
    My last related commit e5e3f3d4 filtered /showIncludes messages
    from the generated xml output but they also need to be filtered
    in ScrapeLog(). Otherwise they are being detected as warnings when
    using compilers withs english diagnostics.

diff --git a/Source/CTest/cmCTestLaunch.cxx b/Source/CTest/cmCTestLaunch.cxx
index 7d9c034..cd3bd57 100644
--- a/Source/CTest/cmCTestLaunch.cxx
+++ b/Source/CTest/cmCTestLaunch.cxx
@@ -587,8 +587,7 @@ void cmCTestLaunch::DumpFileToXML(std::ostream& fxml,
 
   while(cmSystemTools::GetLineFromStream(fin, line))
     {
-    if(OptionFilterPrefix.size() && cmSystemTools::StringStartsWith(
-      line.c_str(), OptionFilterPrefix.c_str()))
+    if(MatchesFilterPrefix(line))
       {
       continue;
       }
@@ -676,6 +675,11 @@ bool cmCTestLaunch::ScrapeLog(std::string const& fname)
   std::string line;
   while(cmSystemTools::GetLineFromStream(fin, line))
     {
+    if(MatchesFilterPrefix(line))
+      {
+      continue;
+      }
+
     if(this->Match(line.c_str(), this->RegexWarning) &&
        !this->Match(line.c_str(), this->RegexWarningSuppress))
       {
@@ -701,6 +705,17 @@ bool cmCTestLaunch::Match(std::string const& line,
 }
 
 //----------------------------------------------------------------------------
+bool cmCTestLaunch::MatchesFilterPrefix(std::string const& line) const
+{
+  if(this->OptionFilterPrefix.size() && cmSystemTools::StringStartsWith(
+      line.c_str(), this->OptionFilterPrefix.c_str()))
+    {
+    return true;
+    }
+  return false;
+}
+
+//----------------------------------------------------------------------------
 int cmCTestLaunch::Main(int argc, const char* const argv[])
 {
   if(argc == 2)
diff --git a/Source/CTest/cmCTestLaunch.h b/Source/CTest/cmCTestLaunch.h
index a86a9df..f680d19 100644
--- a/Source/CTest/cmCTestLaunch.h
+++ b/Source/CTest/cmCTestLaunch.h
@@ -88,6 +88,7 @@ private:
   bool ScrapeLog(std::string const& fname);
   bool Match(std::string const& line,
              std::vector<cmsys::RegularExpression>& regexps);
+  bool MatchesFilterPrefix(std::string const& line) const;
 
   // Methods to generate the xml fragment.
   void WriteXML();

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

Summary of changes:
 Source/CMakeVersion.cmake      |    2 +-
 Source/CTest/cmCTestLaunch.cxx |   19 +++++++++++++++++--
 Source/CTest/cmCTestLaunch.h   |    1 +
 3 files changed, 19 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake