[Cmake-commits] CMake branch, next, updated. v3.2.1-1031-g21d33bf

[Zach Mullen]

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  21d33bf37b0a254b68a3dbaaeb085970503b52d8 (commit)
       via  373eb5496726103d42f447c5a6cd47b8ac5ac138 (commit)
      from  012287707792efea6ed928ceff52cc15364e7eb5 (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=21d33bf37b0a254b68a3dbaaeb085970503b52d8
commit 21d33bf37b0a254b68a3dbaaeb085970503b52d8
Merge: 0122877 373eb54
Author:     Zach Mullen <zach.mullen at kitware.com>
AuthorDate: Mon Mar 16 09:44:34 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Mar 16 09:44:34 2015 -0400

    Merge topic 'output-ctest-env-vars' into next
    
    373eb549 CTest: Specify configuration in new test


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=373eb5496726103d42f447c5a6cd47b8ac5ac138
commit 373eb5496726103d42f447c5a6cd47b8ac5ac138
Author:     Zach Mullen <zach.mullen at kitware.com>
AuthorDate: Mon Mar 16 09:43:19 2015 -0400
Commit:     Zach Mullen <zach.mullen at kitware.com>
CommitDate: Mon Mar 16 09:43:19 2015 -0400

    CTest: Specify configuration in new test

diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 4f1adf3..c4e4d5c 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -2566,6 +2566,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release
   add_test(CTestTestVerboseOutput ${CMAKE_CTEST_COMMAND}
     -S "${CMake_BINARY_DIR}/Tests/CTestTestVerboseOutput/test.cmake" -VV
     --output-log "${CMake_BINARY_DIR}/Tests/CTestTest2/testOutput.log"
+    -C "\${CTestTest_CONFIG}"
     )
   set_property(TEST CTestTestVerboseOutput PROPERTY PASS_REGULAR_EXPRESSION
     "Environment variables:.*foo=bar.*this=that"

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

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


hooks/post-receive
-- 
CMake