[Cmake-commits] CMake branch, next, updated. v3.2.1-1035-g987430c

[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  987430c70a226a5dcf88d04c3d1ab75ac1b142f4 (commit)
       via  5bc304f7fa8e3db252e2c469f9df0204853163cc (commit)
      from  100f5b6c1f44e7b49f0e95e6b4e9f18e4599b05f (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=987430c70a226a5dcf88d04c3d1ab75ac1b142f4
commit 987430c70a226a5dcf88d04c3d1ab75ac1b142f4
Merge: 100f5b6 5bc304f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Mar 17 10:11:24 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Mar 17 10:11:24 2015 -0400

    Merge topic 'output-ctest-env-vars' into next
    
    5bc304f7 fixup! CTest: Output test-specific env vars in verbose mode (#15446)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5bc304f7fa8e3db252e2c469f9df0204853163cc
commit 5bc304f7fa8e3db252e2c469f9df0204853163cc
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Mar 17 10:11:05 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Mar 17 10:11:05 2015 -0400

    fixup! CTest: Output test-specific env vars in verbose mode (#15446)

diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index c4e4d5c..c755651 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -2565,7 +2565,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release
     "${CMake_BINARY_DIR}/Tests/CTestTestVerboseOutput/test.cmake" @ONLY ESCAPE_QUOTES)
   add_test(CTestTestVerboseOutput ${CMAKE_CTEST_COMMAND}
     -S "${CMake_BINARY_DIR}/Tests/CTestTestVerboseOutput/test.cmake" -VV
-    --output-log "${CMake_BINARY_DIR}/Tests/CTestTest2/testOutput.log"
+    --output-log "${CMake_BINARY_DIR}/Tests/CTestTestVerboseOutput/testOutput.log"
     -C "\${CTestTest_CONFIG}"
     )
   set_property(TEST CTestTestVerboseOutput PROPERTY PASS_REGULAR_EXPRESSION

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

Summary of changes:
 Tests/CMakeLists.txt |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake