[Cmake-commits] CMake branch, next, updated. v2.8.12.2-1729-gf7acb81

[Brad King]

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  f7acb810794408b464a02411d7a0591e264f5412 (commit)
       via  47702b8d49d686d4db2c66b6abd872517480d718 (commit)
      from  d1845f4a0daba111275e253d53586dd91dcb4b75 (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=f7acb810794408b464a02411d7a0591e264f5412
commit f7acb810794408b464a02411d7a0591e264f5412
Merge: d1845f4 47702b8
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 25 11:24:27 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Feb 25 11:24:27 2014 -0500

    Merge topic 'fix-showinclude-warnings' into next
    
    47702b8d CTest: exclude /showIncludes notes when scraping logs


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=47702b8d49d686d4db2c66b6abd872517480d718
commit 47702b8d49d686d4db2c66b6abd872517480d718
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Tue Feb 25 11:25:41 2014 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Feb 25 11:23:57 2014 -0500

    CTest: exclude /showIncludes notes when scraping logs
    
    My last related commit e5e3f3d4 (CTest: filter /showIncludes output from
    ninja compile launcher, 2013-12-01) 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:


hooks/post-receive
-- 
CMake