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.
This commit is contained in:
Zack Galbreath
Brad King
parent
4817d2814a
commit
6bf130979e
|
|
@ -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;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -1,2 +1 @@
|
|||
Do not understand memory checker: .*/cmake.*
|
||||
Error in read script: .*/Tests/RunCMake/ctest_memcheck/Unknown/test.cmake
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -1,2 +1 @@
|
|||
Problems when submitting via SCP
|
||||
Error in read script: .*/Tests/RunCMake/ctest_submit/FailDrop-scp/test.cmake
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Reference in New Issue