From 6bf130979e68201aac99c0d2009b50b26a389993 Mon Sep 17 00:00:00 2001 From: Zack Galbreath Date: Thu, 26 Feb 2015 09:00:10 -0500 Subject: [PATCH] CTest: Drop "Error in read script" message at end of testing A more-specific error message is always displayed earlier in the output if any real error occurred. This final summary message is distracting to readers searching through the output for the word "error". Simply drop it. --- Source/CTest/cmCTestScriptHandler.cxx | 6 +----- .../ctest_memcheck/DummyAddressSanitizer-stderr.txt | 1 - Tests/RunCMake/ctest_memcheck/DummyBCNoLogFile-stderr.txt | 1 - Tests/RunCMake/ctest_memcheck/DummyLeakSanitizer-stderr.txt | 1 - .../RunCMake/ctest_memcheck/DummyMemorySanitizer-stderr.txt | 1 - .../RunCMake/ctest_memcheck/DummyPurifyNoLogFile-stderr.txt | 1 - .../RunCMake/ctest_memcheck/DummyThreadSanitizer-stderr.txt | 1 - .../DummyUndefinedBehaviorSanitizer-stderr.txt | 1 - .../ctest_memcheck/DummyValgrindCustomOptions-stderr.txt | 1 - .../ctest_memcheck/DummyValgrindFailPost-stderr.txt | 1 - .../RunCMake/ctest_memcheck/DummyValgrindFailPre-stderr.txt | 1 - .../ctest_memcheck/DummyValgrindInvalidSupFile-stderr.txt | 1 - .../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(-) diff --git a/Source/CTest/cmCTestScriptHandler.cxx b/Source/CTest/cmCTestScriptHandler.cxx index 8184bb459..379295379 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 00f477986..8fa3f1b8b 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 5c582ac2b..adc744b9f 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 c09934019..35510431d 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 6c42ec1ba..02d562674 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 41120b593..653c1367e 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 cb353ad55..5f6c6c1a8 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 7ce798c04..423b7f704 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 97bb833cb..032b5b44f 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 0c997ff2c..6f5231867 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 1d1b1e7d9..973c01486 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 65beb81ad..42cd5e80b 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 e2a836f39..18d9f035f 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 99df8b39b..8868e0c83 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 ec0a8693f..adf334bba 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 c3c084d5a..00a60ac91 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 4345918bf..64c301132 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 9895181a6..73f013880 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 a9c5d58d7..a1ba4f636 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 07902977b..ef671499e 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 23ea92cc5..c0f718e76 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