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 285a9ac82799578706c1ae80dafa33c8eb2c8619 (commit)
via c482c4a4406028e02b90dd2e40f5291a364aa2bb (commit)
from 4dbd32d02224616177686afd8733a4ad03d0c298 (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=285a9ac82799578706c1ae80dafa33c8eb2c8619
commit 285a9ac82799578706c1ae80dafa33c8eb2c8619
Merge: 4dbd32d c482c4a
Author: Bill Hoffman <bill.hoff...@kitware.com>
AuthorDate: Tue Mar 17 17:05:43 2015 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Tue Mar 17 17:05:43 2015 -0400
Merge topic 'ctest-repeat-until-fail' into next
c482c4a4 Pass down the ctest config option to RunCMake tests.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c482c4a4406028e02b90dd2e40f5291a364aa2bb
commit c482c4a4406028e02b90dd2e40f5291a364aa2bb
Author: Bill Hoffman <bill.hoff...@kitware.com>
AuthorDate: Tue Mar 17 17:04:46 2015 -0400
Commit: Bill Hoffman <bill.hoff...@kitware.com>
CommitDate: Tue Mar 17 17:04:46 2015 -0400
Pass down the ctest config option to RunCMake tests.
diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index ffda31f..9cd2e9a 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -20,6 +20,7 @@ macro(add_RunCMake_test test)
-DRunCMake_MAKE_PROGRAM=${CMake_TEST_EXPLICIT_MAKE_PROGRAM}
-DRunCMake_SOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR}/${Test_Dir}
-DRunCMake_BINARY_DIR=${CMAKE_CURRENT_BINARY_DIR}/${test}
+ -DRunCMake_CTestTest_CONFIG=${CTestTest_CONFIG}
${${test}_ARGS}
${TEST_ARGS}
-P "${CMAKE_CURRENT_SOURCE_DIR}/${Test_Dir}/RunCMakeTest.cmake"
diff --git a/Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake
b/Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake
index 916c7bc..7176e2a 100644
--- a/Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake
+++ b/Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake
@@ -16,4 +16,5 @@ set(RunCMake_TEST_OPTIONS -DCMAKE_VERBOSE_MAKEFILE=1)
run_cmake(Build)
unset(RunCMake_TEST_OPTIONS)
run_cmake_command(repeat-until-fail-tests ${CMAKE_CTEST_COMMAND}
+ -C ${RunCMake_CTestTest_CONFIG}
--repeat-until-fail 3 )
-----------------------------------------------------------------------
Summary of changes:
Tests/RunCMake/CMakeLists.txt | 1 +
Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake | 1 +
2 files changed, 2 insertions(+)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
