[Cmake-commits] CMake branch, next, updated. v3.1.0-1963-g97e993b
Brad King
brad.king at kitware.com
Thu Jan 15 15:04:58 EST 2015
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 97e993b0bd69af48d664aa4e77e535d3a85d4bbc (commit)
via 6c121924ada1f26c485c628279d6501406d9e3ac (commit)
from a17fcb54600b756cf8e62aaee55dffe6073fe413 (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=97e993b0bd69af48d664aa4e77e535d3a85d4bbc
commit 97e993b0bd69af48d664aa4e77e535d3a85d4bbc
Merge: a17fcb5 6c12192
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Jan 15 15:04:57 2015 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jan 15 15:04:57 2015 -0500
Merge topic 'tests-RunCMake-report-command' into next
6c121924 Tests: Teach RunCMake to report command-line on failure
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6c121924ada1f26c485c628279d6501406d9e3ac
commit 6c121924ada1f26c485c628279d6501406d9e3ac
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Jan 15 14:36:10 2015 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Jan 15 14:46:58 2015 -0500
Tests: Teach RunCMake to report command-line on failure
When a test sets RunCMake_TEST_COMMAND, report the command line
on failure to make it easier to run by hand for debugging.
diff --git a/Tests/RunCMake/RunCMake.cmake b/Tests/RunCMake/RunCMake.cmake
index 7b3eda7..1625741 100644
--- a/Tests/RunCMake/RunCMake.cmake
+++ b/Tests/RunCMake/RunCMake.cmake
@@ -93,6 +93,10 @@ function(run_cmake test)
if(RunCMake_TEST_FAILED)
set(msg "${RunCMake_TEST_FAILED}\n${msg}")
endif()
+ if(msg AND RunCMake_TEST_COMMAND)
+ string(REPLACE ";" "\" \"" command "\"${RunCMake_TEST_COMMAND}\"")
+ set(msg "${msg}Command was:\n command> ${command}\n")
+ endif()
if(msg)
string(REGEX REPLACE "\n" "\n actual-out> " actual_out " actual-out> ${actual_stdout}")
string(REGEX REPLACE "\n" "\n actual-err> " actual_err " actual-err> ${actual_stderr}")
-----------------------------------------------------------------------
Summary of changes:
Tests/RunCMake/RunCMake.cmake | 4 ++++
1 file changed, 4 insertions(+)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list