[Cmake-commits] CMake branch, master, updated. v3.9.2-808-g90b931e

Kitware Robot kwrobot at kitware.com
Thu Sep 14 14:55:05 EDT 2017


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, master has been updated
       via  90b931e115fa6da965135a3a2160e2efbeac2379 (commit)
       via  a7a6ae5edde8a7c091822998da76846d0befc163 (commit)
      from  0865a24fc1c47d75f1381659ba398e6944c9a724 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=90b931e115fa6da965135a3a2160e2efbeac2379
commit 90b931e115fa6da965135a3a2160e2efbeac2379
Merge: 0865a24 a7a6ae5e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Sep 14 18:50:59 2017 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Thu Sep 14 14:51:05 2017 -0400

    Merge topic 'doc-RunCMake-result'
    
    a7a6ae5e Tests: Update RunCMake/README.rst to clarify meaning of -result.txt
    
    Acked-by: Kitware Robot <kwrobot at kitware.com>
    Merge-request: !1268


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a7a6ae5edde8a7c091822998da76846d0befc163
commit a7a6ae5edde8a7c091822998da76846d0befc163
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Sep 14 14:15:26 2017 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Sep 14 14:15:26 2017 -0400

    Tests: Update RunCMake/README.rst to clarify meaning of -result.txt
    
    The content of `-result.txt` files is a regex, but the documentation
    didn't make this clear.
    
    Suggested-by: Deniz Bahadir <dbahadir at benocs.com>

diff --git a/Tests/RunCMake/README.rst b/Tests/RunCMake/README.rst
index 4aae4ae..08b51d9 100644
--- a/Tests/RunCMake/README.rst
+++ b/Tests/RunCMake/README.rst
@@ -47,11 +47,11 @@ but do not actually build anything.  To add a test:
    containing expected test results:
 
    ``<SubTest>-result.txt``
-    Process result expected if not "0"
+    Regex matching expected process result, if not ``0``
    ``<SubTest>-stdout.txt``
     Regex matching expected stdout content
    ``<SubTest>-stderr.txt``
-    Regex matching expected stderr content, if not "^$"
+    Regex matching expected stderr content, if not ``^$``
    ``<SubTest>-check.cmake``
     Custom result check.
 

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

Summary of changes:
 Tests/RunCMake/README.rst |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list