[Cmake-commits] CMake branch, next, updated. v3.1.0-rc1-607-g52476c4

[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  52476c444975b4313ded35391a9c360964273501 (commit)
       via  0854d45bbbf2e0ddfb80fc9856a3b7b7c189e175 (commit)
      from  5633c9d898682b5a92e5411c205f6a7f888b9e42 (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=52476c444975b4313ded35391a9c360964273501
commit 52476c444975b4313ded35391a9c360964273501
Merge: 5633c9d 0854d45
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Nov 13 09:39:32 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Nov 13 09:39:32 2014 -0500

    Merge topic 'fix-config-dependent-tests' into next
    
    0854d45b Tests: Build config-dependent tests in the same config they run


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0854d45bbbf2e0ddfb80fc9856a3b7b7c189e175
commit 0854d45bbbf2e0ddfb80fc9856a3b7b7c189e175
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Nov 13 09:34:31 2014 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Nov 13 09:37:11 2014 -0500

    Tests: Build config-dependent tests in the same config they run
    
    The CPackComponentsForAll-*, GeneratorExpression, and
    TestsWorkingDirectory tests all build binaries that they later
    need to run or package for the tested configuration.  Tell the
    'ctest --build-and-test' call to use the same configuration
    for driving the build process.

diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index ab83d41..3e29683 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -690,7 +690,8 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release
     FAIL_REGULAR_EXPRESSION "Unexpected: ")
   list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/ArgumentExpansion")
 
-  add_test(GeneratorExpression  ${CMAKE_CTEST_COMMAND}
+  add_test(GeneratorExpression
+    ${CMAKE_CTEST_COMMAND} -C \${CTEST_CONFIGURATION_TYPE}
     --build-and-test
     "${CMake_SOURCE_DIR}/Tests/GeneratorExpression"
     "${CMake_BINARY_DIR}/Tests/GeneratorExpression"
@@ -950,7 +951,8 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release
       set(CPackRun_CPackGen  "-DCPackGen=${CPackGen}")
       foreach(CPackComponentWay ${CWAYLST})
         set(CPackRun_CPackComponentWay "-DCPackComponentWay=${CPackComponentWay}")
-        add_test(CPackComponentsForAll-${CPackGen}-${CPackComponentWay} ${CMAKE_CTEST_COMMAND}
+        add_test(CPackComponentsForAll-${CPackGen}-${CPackComponentWay}
+          ${CMAKE_CTEST_COMMAND} -C \${CTEST_CONFIGURATION_TYPE}
           --build-and-test
           "${CMake_SOURCE_DIR}/Tests/CPackComponentsForAll"
           "${CMake_BINARY_DIR}/Tests/CPackComponentsForAll/build${CPackGen}-${CPackComponentWay}"
@@ -2041,7 +2043,8 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release
     PASS_REGULAR_EXPRESSION "uninitialized variable 'USED_VARIABLE'")
   list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/WarnUninitialized")
 
-  add_test(TestsWorkingDirectory ${CMAKE_CTEST_COMMAND}
+  add_test(TestsWorkingDirectory
+    ${CMAKE_CTEST_COMMAND} -C \${CTEST_CONFIGURATION_TYPE}
     --build-and-test
     "${CMake_SOURCE_DIR}/Tests/TestsWorkingDirectory"
     "${CMake_BINARY_DIR}/Tests/TestsWorkingDirectory"

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

Summary of changes:
 Tests/CMakeLists.txt |    9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake