1
0
Эх сурвалжийг харах

Merge topic 'remove_error_read_script'

6bf13097 CTest: Drop "Error in read script" message at end of testing
Brad King 10 жил өмнө
parent
commit
29b5ca108e
21 өөрчлөгдсөн 1 нэмэгдсэн , 25 устгасан
  1. 1 5
      Source/CTest/cmCTestScriptHandler.cxx
  2. 0 1
      Tests/RunCMake/ctest_memcheck/DummyAddressSanitizer-stderr.txt
  3. 0 1
      Tests/RunCMake/ctest_memcheck/DummyBCNoLogFile-stderr.txt
  4. 0 1
      Tests/RunCMake/ctest_memcheck/DummyLeakSanitizer-stderr.txt
  5. 0 1
      Tests/RunCMake/ctest_memcheck/DummyMemorySanitizer-stderr.txt
  6. 0 1
      Tests/RunCMake/ctest_memcheck/DummyPurifyNoLogFile-stderr.txt
  7. 0 1
      Tests/RunCMake/ctest_memcheck/DummyThreadSanitizer-stderr.txt
  8. 0 1
      Tests/RunCMake/ctest_memcheck/DummyUndefinedBehaviorSanitizer-stderr.txt
  9. 0 1
      Tests/RunCMake/ctest_memcheck/DummyValgrindCustomOptions-stderr.txt
  10. 0 1
      Tests/RunCMake/ctest_memcheck/DummyValgrindFailPost-stderr.txt
  11. 0 1
      Tests/RunCMake/ctest_memcheck/DummyValgrindFailPre-stderr.txt
  12. 0 1
      Tests/RunCMake/ctest_memcheck/DummyValgrindInvalidSupFile-stderr.txt
  13. 0 1
      Tests/RunCMake/ctest_memcheck/DummyValgrindNoLogFile-stderr.txt
  14. 0 1
      Tests/RunCMake/ctest_memcheck/Unknown-stderr.txt
  15. 0 1
      Tests/RunCMake/ctest_submit/CDashSubmitQuiet-stderr.txt
  16. 0 1
      Tests/RunCMake/ctest_submit/FailDrop-cp-stderr.txt
  17. 0 1
      Tests/RunCMake/ctest_submit/FailDrop-ftp-stderr.txt
  18. 0 1
      Tests/RunCMake/ctest_submit/FailDrop-http-stderr.txt
  19. 0 1
      Tests/RunCMake/ctest_submit/FailDrop-https-stderr.txt
  20. 0 1
      Tests/RunCMake/ctest_submit/FailDrop-scp-stderr.txt
  21. 0 1
      Tests/RunCMake/ctest_submit/FailDrop-xmlrpc-stderr.txt

+ 1 - 5
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;
     }

+ 0 - 1
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

+ 0 - 1
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

+ 0 - 1
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

+ 0 - 1
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

+ 0 - 1
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

+ 0 - 1
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

+ 0 - 1
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

+ 0 - 1
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

+ 0 - 1
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

+ 0 - 1
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

+ 0 - 1
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

+ 0 - 1
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

+ 0 - 1
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

+ 0 - 1
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

+ 0 - 1
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

+ 0 - 1
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

+ 0 - 1
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

+ 0 - 1
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

+ 0 - 1
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

+ 0 - 1
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