[Cmake-commits] CMake branch, next, updated. v2.8.11.2-3374-g7669da0

[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  7669da05554a116ab176232826e535881caae3ed (commit)
       via  c80a4f92cea370b3cc9b9f3e03332c7eb7a6a31a (commit)
      from  31ec803b7b731607d04f2d7ff7ddd0a2fc96f0cd (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=7669da05554a116ab176232826e535881caae3ed
commit 7669da05554a116ab176232826e535881caae3ed
Merge: 31ec803 c80a4f9
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jul 25 08:46:45 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jul 25 08:46:45 2013 -0400

    Merge topic 'doc-RunCMake-strips-expected' into next
    
    c80a4f9 Tests/RunCMake: Document stripping of expected output


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c80a4f92cea370b3cc9b9f3e03332c7eb7a6a31a
commit c80a4f92cea370b3cc9b9f3e03332c7eb7a6a31a
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Wed Jul 24 14:01:21 2013 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Jul 25 08:38:53 2013 -0400

    Tests/RunCMake: Document stripping of expected output
    
    Document that trailing newlines are stripped from the -stdout.txt
    and -stderr.txt content before using as a regular expression.

diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index 66ce3f1..9294fa1 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -28,7 +28,7 @@
 #   <SubTest>-stdout.txt  = Regex matching expected stdout content
 #   <SubTest>-stderr.txt  = Regex matching expected stderr content
 #   <SubTest>-check.cmake = Custom result check
-# Note that trailing newlines will be stripped from actual test
+# Note that trailing newlines will be stripped from actual and expected test
 # output before matching against the stdout and stderr expressions.
 # The code in <SubTest>-check.cmake may use variables
 #   RunCMake_TEST_SOURCE_DIR = Top of test source tree

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

Summary of changes:


hooks/post-receive
-- 
CMake