[Cmake-commits] CMake branch, master, updated. v3.2.3-1397-g94070b8

[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, master has been updated
       via  94070b8dfa9f12b13a6794e41e605920e80da696 (commit)
       via  721b7e3e56f8a9e7f6daf1602dcc5cd85677fc84 (commit)
      from  2b083b19ebe7ee11fa0f9aa68bfc22616106c5a0 (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=94070b8dfa9f12b13a6794e41e605920e80da696
commit 94070b8dfa9f12b13a6794e41e605920e80da696
Merge: 2b083b1 721b7e3
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jun 4 09:13:25 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jun 4 09:13:25 2015 -0400

    Merge topic 'ctest-merge-test-output'
    
    721b7e3e CTest: Capture test stdout/stderr through one pipe (#15600)


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

Summary of changes:
 Source/CTest/cmCTestRunTest.cxx                     |    3 +--
 Source/CTest/cmProcess.cxx                          |   19 ++++---------------
 Source/CTest/cmProcess.h                            |    7 ++-----
 .../CTestCommandLine/MergeOutput-stdout.txt         |   13 +++++++++++++
 .../MergeOutput.cmake                               |    0
 Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake  |   13 +++++++++++++
 6 files changed, 33 insertions(+), 22 deletions(-)
 create mode 100644 Tests/RunCMake/CTestCommandLine/MergeOutput-stdout.txt
 copy Tests/RunCMake/{execute_process => CTestCommandLine}/MergeOutput.cmake (100%)


hooks/post-receive
-- 
CMake