[Cmake-commits] CMake branch, next, updated. v3.2.0-rc2-753-g3f52c32
Zack Galbreath
zack.galbreath at kitware.com
Thu Feb 26 09:02:15 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 3f52c32ebb037d504c4ebc6797d318fe85747dde (commit)
via 0817080fbb3aff8ff114047c63e7b51992829187 (commit)
from a4cba1faafe427a465ec9d78b7e6f770e11e6b54 (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=3f52c32ebb037d504c4ebc6797d318fe85747dde
commit 3f52c32ebb037d504c4ebc6797d318fe85747dde
Merge: a4cba1f 0817080
Author: Zack Galbreath <zack.galbreath at kitware.com>
AuthorDate: Thu Feb 26 09:02:14 2015 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Feb 26 09:02:14 2015 -0500
Merge topic 'remove_error_read_script' into next
0817080f Don't print "Error in read script"
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0817080fbb3aff8ff114047c63e7b51992829187
commit 0817080fbb3aff8ff114047c63e7b51992829187
Author: Zack Galbreath <zack.galbreath at kitware.com>
AuthorDate: Thu Feb 26 09:00:10 2015 -0500
Commit: Zack Galbreath <zack.galbreath at kitware.com>
CommitDate: Thu Feb 26 09:00:10 2015 -0500
Don't print "Error in read script"
This was distracting to our users searching through CTest's
output for the word "error". A more specific error message was
displayed earlier in CTest's output, so printing this statement at
the end of execution is not particularly helpful.
diff --git a/Source/CTest/cmCTestScriptHandler.cxx b/Source/CTest/cmCTestScriptHandler.cxx
index 8184bb4..3792953 100644
--- a/Source/CTest/cmCTestScriptHandler.cxx
+++ b/Source/CTest/cmCTestScriptHandler.cxx
@@ -454,12 +454,8 @@ int cmCTestScriptHandler::ReadInScript(const std::string& total_script_arg)
if (!this->Makefile->ReadListFile(0, script.c_str()) ||
cmSystemTools::GetErrorOccuredFlag())
{
- cmCTestLog(this->CTest, ERROR_MESSAGE, "Error in read script: "
- << script
- << std::endl);
// Reset the error flag so that it can run more than
- // one script with an error when you
- // use ctest_run_script
+ // one script with an error when you use ctest_run_script.
cmSystemTools::ResetErrorOccuredFlag();
return 2;
}
diff --git a/Tests/RunCMake/ctest_memcheck/DummyAddressSanitizer-stderr.txt b/Tests/RunCMake/ctest_memcheck/DummyAddressSanitizer-stderr.txt
index 00f4779..8fa3f1b 100644
--- a/Tests/RunCMake/ctest_memcheck/DummyAddressSanitizer-stderr.txt
+++ b/Tests/RunCMake/ctest_memcheck/DummyAddressSanitizer-stderr.txt
@@ -1,2 +1 @@
Cannot find memory tester output file: .*/Tests/RunCMake/ctest_memcheck/DummyAddressSanitizer-build/Testing/Temporary/MemoryChecker.1.log\.\*
-Error in read script: .*/Tests/RunCMake/ctest_memcheck/DummyAddressSanitizer/test.cmake
diff --git a/Tests/RunCMake/ctest_memcheck/DummyBCNoLogFile-stderr.txt b/Tests/RunCMake/ctest_memcheck/DummyBCNoLogFile-stderr.txt
index 5c582ac..adc744b 100644
--- a/Tests/RunCMake/ctest_memcheck/DummyBCNoLogFile-stderr.txt
+++ b/Tests/RunCMake/ctest_memcheck/DummyBCNoLogFile-stderr.txt
@@ -1,3 +1,2 @@
Cannot find memory tester output file: .*/Tests/RunCMake/ctest_memcheck/DummyBCNoLogFile-build/Testing/Temporary/MemoryChecker.1.log
.*Error parsing XML in stream at line 1: no element found
-Error in read script: .*/Tests/RunCMake/ctest_memcheck/DummyBCNoLogFile/test.cmake
diff --git a/Tests/RunCMake/ctest_memcheck/DummyLeakSanitizer-stderr.txt b/Tests/RunCMake/ctest_memcheck/DummyLeakSanitizer-stderr.txt
index c099340..3551043 100644
--- a/Tests/RunCMake/ctest_memcheck/DummyLeakSanitizer-stderr.txt
+++ b/Tests/RunCMake/ctest_memcheck/DummyLeakSanitizer-stderr.txt
@@ -1,2 +1 @@
Cannot find memory tester output file: .*/Tests/RunCMake/ctest_memcheck/DummyLeakSanitizer-build/Testing/Temporary/MemoryChecker.1.log\.\*
-Error in read script: .*/Tests/RunCMake/ctest_memcheck/DummyLeakSanitizer/test.cmake
diff --git a/Tests/RunCMake/ctest_memcheck/DummyMemorySanitizer-stderr.txt b/Tests/RunCMake/ctest_memcheck/DummyMemorySanitizer-stderr.txt
index 6c42ec1..02d5626 100644
--- a/Tests/RunCMake/ctest_memcheck/DummyMemorySanitizer-stderr.txt
+++ b/Tests/RunCMake/ctest_memcheck/DummyMemorySanitizer-stderr.txt
@@ -1,2 +1 @@
Cannot find memory tester output file: .*/Tests/RunCMake/ctest_memcheck/DummyMemorySanitizer-build/Testing/Temporary/MemoryChecker.1.log\.\*
-Error in read script: .*/Tests/RunCMake/ctest_memcheck/DummyMemorySanitizer/test.cmake
diff --git a/Tests/RunCMake/ctest_memcheck/DummyPurifyNoLogFile-stderr.txt b/Tests/RunCMake/ctest_memcheck/DummyPurifyNoLogFile-stderr.txt
index 41120b5..653c136 100644
--- a/Tests/RunCMake/ctest_memcheck/DummyPurifyNoLogFile-stderr.txt
+++ b/Tests/RunCMake/ctest_memcheck/DummyPurifyNoLogFile-stderr.txt
@@ -1,2 +1 @@
Cannot find memory tester output file: .*/Tests/RunCMake/ctest_memcheck/DummyPurifyNoLogFile-build/Testing/Temporary/MemoryChecker.1.log
-Error in read script: .*/Tests/RunCMake/ctest_memcheck/DummyPurifyNoLogFile/test.cmake
diff --git a/Tests/RunCMake/ctest_memcheck/DummyThreadSanitizer-stderr.txt b/Tests/RunCMake/ctest_memcheck/DummyThreadSanitizer-stderr.txt
index cb353ad..5f6c6c1 100644
--- a/Tests/RunCMake/ctest_memcheck/DummyThreadSanitizer-stderr.txt
+++ b/Tests/RunCMake/ctest_memcheck/DummyThreadSanitizer-stderr.txt
@@ -1,2 +1 @@
Cannot find memory tester output file: .*/Tests/RunCMake/ctest_memcheck/DummyThreadSanitizer-build/Testing/Temporary/MemoryChecker.1.log\.\*
-Error in read script: .*/Tests/RunCMake/ctest_memcheck/DummyThreadSanitizer/test.cmake
diff --git a/Tests/RunCMake/ctest_memcheck/DummyUndefinedBehaviorSanitizer-stderr.txt b/Tests/RunCMake/ctest_memcheck/DummyUndefinedBehaviorSanitizer-stderr.txt
index 7ce798c..423b7f7 100644
--- a/Tests/RunCMake/ctest_memcheck/DummyUndefinedBehaviorSanitizer-stderr.txt
+++ b/Tests/RunCMake/ctest_memcheck/DummyUndefinedBehaviorSanitizer-stderr.txt
@@ -1,2 +1 @@
Cannot find memory tester output file: .*/Tests/RunCMake/ctest_memcheck/DummyUndefinedBehaviorSanitizer-build/Testing/Temporary/MemoryChecker.1.log\.\*
-Error in read script: .*/Tests/RunCMake/ctest_memcheck/DummyUndefinedBehaviorSanitizer/test.cmake
diff --git a/Tests/RunCMake/ctest_memcheck/DummyValgrindCustomOptions-stderr.txt b/Tests/RunCMake/ctest_memcheck/DummyValgrindCustomOptions-stderr.txt
index 97bb833..032b5b4 100644
--- a/Tests/RunCMake/ctest_memcheck/DummyValgrindCustomOptions-stderr.txt
+++ b/Tests/RunCMake/ctest_memcheck/DummyValgrindCustomOptions-stderr.txt
@@ -1,2 +1 @@
Cannot find memory tester output file: .*/Tests/RunCMake/ctest_memcheck/DummyValgrindCustomOptions-build/Testing/Temporary/MemoryChecker.1.log
-Error in read script: .*/Tests/RunCMake/ctest_memcheck/DummyValgrindCustomOptions/test.cmake
diff --git a/Tests/RunCMake/ctest_memcheck/DummyValgrindFailPost-stderr.txt b/Tests/RunCMake/ctest_memcheck/DummyValgrindFailPost-stderr.txt
index 0c997ff..6f52318 100644
--- a/Tests/RunCMake/ctest_memcheck/DummyValgrindFailPost-stderr.txt
+++ b/Tests/RunCMake/ctest_memcheck/DummyValgrindFailPost-stderr.txt
@@ -1,3 +1,2 @@
Problem running command: .*memcheck_fail.*
Problem executing post-memcheck command\(s\).
-Error in read script: .*/Tests/RunCMake/ctest_memcheck/DummyValgrindFailPost/test.cmake
diff --git a/Tests/RunCMake/ctest_memcheck/DummyValgrindFailPre-stderr.txt b/Tests/RunCMake/ctest_memcheck/DummyValgrindFailPre-stderr.txt
index 1d1b1e7..973c014 100644
--- a/Tests/RunCMake/ctest_memcheck/DummyValgrindFailPre-stderr.txt
+++ b/Tests/RunCMake/ctest_memcheck/DummyValgrindFailPre-stderr.txt
@@ -1,3 +1,2 @@
Problem running command: .*memcheck_fail.*
Problem executing pre-memcheck command\(s\).
-Error in read script: .*/Tests/RunCMake/ctest_memcheck/DummyValgrindFailPre/test.cmake
diff --git a/Tests/RunCMake/ctest_memcheck/DummyValgrindInvalidSupFile-stderr.txt b/Tests/RunCMake/ctest_memcheck/DummyValgrindInvalidSupFile-stderr.txt
index 65beb81..42cd5e8 100644
--- a/Tests/RunCMake/ctest_memcheck/DummyValgrindInvalidSupFile-stderr.txt
+++ b/Tests/RunCMake/ctest_memcheck/DummyValgrindInvalidSupFile-stderr.txt
@@ -1,2 +1 @@
Cannot find memory checker suppression file: .*/Tests/RunCMake/ctest_memcheck/DummyValgrindInvalidSupFile-build/does-not-exist
-Error in read script: .*/Tests/RunCMake/ctest_memcheck/DummyValgrindInvalidSupFile/test.cmake
diff --git a/Tests/RunCMake/ctest_memcheck/DummyValgrindNoLogFile-stderr.txt b/Tests/RunCMake/ctest_memcheck/DummyValgrindNoLogFile-stderr.txt
index e2a836f..18d9f03 100644
--- a/Tests/RunCMake/ctest_memcheck/DummyValgrindNoLogFile-stderr.txt
+++ b/Tests/RunCMake/ctest_memcheck/DummyValgrindNoLogFile-stderr.txt
@@ -1,2 +1 @@
Cannot find memory tester output file: .*/Tests/RunCMake/ctest_memcheck/DummyValgrindNoLogFile-build/Testing/Temporary/MemoryChecker.1.log
-Error in read script: .*/Tests/RunCMake/ctest_memcheck/DummyValgrindNoLogFile/test.cmake
diff --git a/Tests/RunCMake/ctest_memcheck/Unknown-stderr.txt b/Tests/RunCMake/ctest_memcheck/Unknown-stderr.txt
index 99df8b3..8868e0c 100644
--- a/Tests/RunCMake/ctest_memcheck/Unknown-stderr.txt
+++ b/Tests/RunCMake/ctest_memcheck/Unknown-stderr.txt
@@ -1,2 +1 @@
Do not understand memory checker: .*/cmake.*
-Error in read script: .*/Tests/RunCMake/ctest_memcheck/Unknown/test.cmake
diff --git a/Tests/RunCMake/ctest_submit/CDashSubmitQuiet-stderr.txt b/Tests/RunCMake/ctest_submit/CDashSubmitQuiet-stderr.txt
index ec0a869..adf334b 100644
--- a/Tests/RunCMake/ctest_submit/CDashSubmitQuiet-stderr.txt
+++ b/Tests/RunCMake/ctest_submit/CDashSubmitQuiet-stderr.txt
@@ -1,4 +1,3 @@
*Error when uploading file: .*/Configure.xml
*Error message was: ([Cc]ould *n.t resolve host:? '?-no-site-'?|The requested URL returned error:.*)
*Problems when submitting via HTTP
- *Error in read script: .*/Tests/RunCMake/ctest_submit/CDashSubmitQuiet/test.cmake
diff --git a/Tests/RunCMake/ctest_submit/FailDrop-cp-stderr.txt b/Tests/RunCMake/ctest_submit/FailDrop-cp-stderr.txt
index c3c084d..00a60ac 100644
--- a/Tests/RunCMake/ctest_submit/FailDrop-cp-stderr.txt
+++ b/Tests/RunCMake/ctest_submit/FailDrop-cp-stderr.txt
@@ -1,4 +1,3 @@
Missing arguments for submit via cp:
.*
Problems when submitting via CP
-Error in read script: .*/Tests/RunCMake/ctest_submit/FailDrop-cp/test.cmake
diff --git a/Tests/RunCMake/ctest_submit/FailDrop-ftp-stderr.txt b/Tests/RunCMake/ctest_submit/FailDrop-ftp-stderr.txt
index 4345918..64c3011 100644
--- a/Tests/RunCMake/ctest_submit/FailDrop-ftp-stderr.txt
+++ b/Tests/RunCMake/ctest_submit/FailDrop-ftp-stderr.txt
@@ -1,3 +1,2 @@
Error message was: ([Cc]ould *n.t resolve host:? '?-no-site-'?|The requested URL returned error:.*)
Problems when submitting via FTP
-Error in read script: .*/Tests/RunCMake/ctest_submit/FailDrop-ftp/test.cmake
diff --git a/Tests/RunCMake/ctest_submit/FailDrop-http-stderr.txt b/Tests/RunCMake/ctest_submit/FailDrop-http-stderr.txt
index 9895181..73f0138 100644
--- a/Tests/RunCMake/ctest_submit/FailDrop-http-stderr.txt
+++ b/Tests/RunCMake/ctest_submit/FailDrop-http-stderr.txt
@@ -1,3 +1,2 @@
Error message was: ([Cc]ould *n.t resolve host:? '?-no-site-'?|The requested URL returned error:.*)
Problems when submitting via HTTP
-Error in read script: .*/Tests/RunCMake/ctest_submit/FailDrop-http/test.cmake
diff --git a/Tests/RunCMake/ctest_submit/FailDrop-https-stderr.txt b/Tests/RunCMake/ctest_submit/FailDrop-https-stderr.txt
index a9c5d58..a1ba4f6 100644
--- a/Tests/RunCMake/ctest_submit/FailDrop-https-stderr.txt
+++ b/Tests/RunCMake/ctest_submit/FailDrop-https-stderr.txt
@@ -1,3 +1,2 @@
Error message was: ([Cc]ould *n.t resolve host:? '?-no-site-'?|The requested URL returned error:.*|Protocol "https" not supported or disabled in .*|.* was built with SSL disabled.*)
Problems when submitting via HTTP
-Error in read script: .*/Tests/RunCMake/ctest_submit/FailDrop-https/test.cmake
diff --git a/Tests/RunCMake/ctest_submit/FailDrop-scp-stderr.txt b/Tests/RunCMake/ctest_submit/FailDrop-scp-stderr.txt
index 0790297..ef67149 100644
--- a/Tests/RunCMake/ctest_submit/FailDrop-scp-stderr.txt
+++ b/Tests/RunCMake/ctest_submit/FailDrop-scp-stderr.txt
@@ -1,2 +1 @@
Problems when submitting via SCP
-Error in read script: .*/Tests/RunCMake/ctest_submit/FailDrop-scp/test.cmake
diff --git a/Tests/RunCMake/ctest_submit/FailDrop-xmlrpc-stderr.txt b/Tests/RunCMake/ctest_submit/FailDrop-xmlrpc-stderr.txt
index 23ea92c..c0f718e 100644
--- a/Tests/RunCMake/ctest_submit/FailDrop-xmlrpc-stderr.txt
+++ b/Tests/RunCMake/ctest_submit/FailDrop-xmlrpc-stderr.txt
@@ -1,2 +1 @@
(Problems when submitting via XML-RPC|Submission method "xmlrpc" not compiled into CTest!)
-Error in read script: .*/Tests/RunCMake/ctest_submit/FailDrop-xmlrpc/test.cmake
-----------------------------------------------------------------------
Summary of changes:
Source/CTest/cmCTestScriptHandler.cxx | 6 +-----
Tests/RunCMake/ctest_memcheck/DummyAddressSanitizer-stderr.txt | 1 -
Tests/RunCMake/ctest_memcheck/DummyBCNoLogFile-stderr.txt | 1 -
Tests/RunCMake/ctest_memcheck/DummyLeakSanitizer-stderr.txt | 1 -
Tests/RunCMake/ctest_memcheck/DummyMemorySanitizer-stderr.txt | 1 -
Tests/RunCMake/ctest_memcheck/DummyPurifyNoLogFile-stderr.txt | 1 -
Tests/RunCMake/ctest_memcheck/DummyThreadSanitizer-stderr.txt | 1 -
.../ctest_memcheck/DummyUndefinedBehaviorSanitizer-stderr.txt | 1 -
.../ctest_memcheck/DummyValgrindCustomOptions-stderr.txt | 1 -
Tests/RunCMake/ctest_memcheck/DummyValgrindFailPost-stderr.txt | 1 -
Tests/RunCMake/ctest_memcheck/DummyValgrindFailPre-stderr.txt | 1 -
.../ctest_memcheck/DummyValgrindInvalidSupFile-stderr.txt | 1 -
Tests/RunCMake/ctest_memcheck/DummyValgrindNoLogFile-stderr.txt | 1 -
Tests/RunCMake/ctest_memcheck/Unknown-stderr.txt | 1 -
Tests/RunCMake/ctest_submit/CDashSubmitQuiet-stderr.txt | 1 -
Tests/RunCMake/ctest_submit/FailDrop-cp-stderr.txt | 1 -
Tests/RunCMake/ctest_submit/FailDrop-ftp-stderr.txt | 1 -
Tests/RunCMake/ctest_submit/FailDrop-http-stderr.txt | 1 -
Tests/RunCMake/ctest_submit/FailDrop-https-stderr.txt | 1 -
Tests/RunCMake/ctest_submit/FailDrop-scp-stderr.txt | 1 -
Tests/RunCMake/ctest_submit/FailDrop-xmlrpc-stderr.txt | 1 -
21 files changed, 1 insertion(+), 25 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list