[Cmake-commits] CMake branch, next, updated. v3.2.0-rc2-741-g9715186
Zack Galbreath
zack.galbreath at kitware.com
Wed Feb 25 15:03:32 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 9715186541d1b94762a36a85ad769339c13c9c60 (commit)
via ade4ad327a1a7e061a879c8f327af4308ae636fc (commit)
via fa4cce658a0768e3ca7b8e2de086dc045aa0fda2 (commit)
via f5de2d8e8a097319e6d1e9db23b19e9edb3e6c5a (commit)
via 614e2d3488b1306051f562e98c103a3a137773b0 (commit)
from 3fd4bd8cf59b0e3612f4d946201f63485f245649 (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=9715186541d1b94762a36a85ad769339c13c9c60
commit 9715186541d1b94762a36a85ad769339c13c9c60
Merge: 3fd4bd8 ade4ad3
Author: Zack Galbreath <zack.galbreath at kitware.com>
AuthorDate: Wed Feb 25 15:03:31 2015 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 25 15:03:31 2015 -0500
Merge topic 'error_in_read_script' into next
ade4ad32 tolerate spaces in path for RunCMake.ctest_build
fa4cce65 Adopt CMAKELISTS_EXTRA_CODE approach
f5de2d8e remove redundant calls to SetScriptErrorOccurred
614e2d34 remove some calls to SetScriptErrorOccurred
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ade4ad327a1a7e061a879c8f327af4308ae636fc
commit ade4ad327a1a7e061a879c8f327af4308ae636fc
Author: Zack Galbreath <zack.galbreath at kitware.com>
AuthorDate: Wed Feb 25 14:44:33 2015 -0500
Commit: Zack Galbreath <zack.galbreath at kitware.com>
CommitDate: Wed Feb 25 14:44:33 2015 -0500
tolerate spaces in path for RunCMake.ctest_build
diff --git a/Tests/RunCMake/ctest_build/RunCMakeTest.cmake b/Tests/RunCMake/ctest_build/RunCMakeTest.cmake
index c4dc301..e2b23c4 100644
--- a/Tests/RunCMake/ctest_build/RunCMakeTest.cmake
+++ b/Tests/RunCMake/ctest_build/RunCMakeTest.cmake
@@ -12,6 +12,6 @@ run_ctest_build(BuildQuiet QUIET)
set(CMAKELISTS_EXTRA_CODE "
enable_language(CXX)
add_executable(compile_error
- ${RunCMake_SOURCE_DIR}/../../CTestTestFailure/badCode.cxx)")
+ \"${RunCMake_SOURCE_DIR}/../../CTestTestFailure/badCode.cxx\")")
run_ctest_build(BuildCompileError TARGET compile_error)
set(CMAKELISTS_EXTRA_CODE "")
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fa4cce658a0768e3ca7b8e2de086dc045aa0fda2
commit fa4cce658a0768e3ca7b8e2de086dc045aa0fda2
Author: Zack Galbreath <zack.galbreath at kitware.com>
AuthorDate: Wed Feb 25 11:27:14 2015 -0500
Commit: Zack Galbreath <zack.galbreath at kitware.com>
CommitDate: Wed Feb 25 11:27:14 2015 -0500
Adopt CMAKELISTS_EXTRA_CODE approach
This is a more encapsulated way to perform our new
"Error in read script" test cases.
diff --git a/Tests/RunCMake/ctest_build/CMakeLists.txt.in b/Tests/RunCMake/ctest_build/CMakeLists.txt.in
index 55ccc19..97c4ec2 100644
--- a/Tests/RunCMake/ctest_build/CMakeLists.txt.in
+++ b/Tests/RunCMake/ctest_build/CMakeLists.txt.in
@@ -1,6 +1,5 @@
cmake_minimum_required(VERSION 3.1)
-project(CTestBuild at CASE_NAME@)
+project(CTestBuild at CASE_NAME@ NONE)
include(CTest)
add_test(NAME RunCMakeVersion COMMAND "${CMAKE_COMMAND}" --version)
-add_executable(compile_error EXCLUDE_FROM_ALL
- @RunCMake_SOURCE_DIR@/../../CTestTestFailure/badCode.cxx)
+ at CMAKELISTS_EXTRA_CODE@
diff --git a/Tests/RunCMake/ctest_build/RunCMakeTest.cmake b/Tests/RunCMake/ctest_build/RunCMakeTest.cmake
index 2fc80d3..c4dc301 100644
--- a/Tests/RunCMake/ctest_build/RunCMakeTest.cmake
+++ b/Tests/RunCMake/ctest_build/RunCMakeTest.cmake
@@ -8,4 +8,10 @@ function(run_ctest_build CASE_NAME)
endfunction()
run_ctest_build(BuildQuiet QUIET)
+
+set(CMAKELISTS_EXTRA_CODE "
+enable_language(CXX)
+add_executable(compile_error
+ ${RunCMake_SOURCE_DIR}/../../CTestTestFailure/badCode.cxx)")
run_ctest_build(BuildCompileError TARGET compile_error)
+set(CMAKELISTS_EXTRA_CODE "")
diff --git a/Tests/RunCMake/ctest_test/CMakeLists.txt.in b/Tests/RunCMake/ctest_test/CMakeLists.txt.in
index 2a095dd..6b3f485 100644
--- a/Tests/RunCMake/ctest_test/CMakeLists.txt.in
+++ b/Tests/RunCMake/ctest_test/CMakeLists.txt.in
@@ -2,6 +2,4 @@ cmake_minimum_required(VERSION 3.1)
project(CTestTest at CASE_NAME@ NONE)
include(CTest)
add_test(NAME RunCMakeVersion COMMAND "${CMAKE_COMMAND}" --version)
-
-add_test(NAME CMakeVersionFail COMMAND "${CMAKE_COMMAND}" --version)
-set_tests_properties(CMakeVersionFail PROPERTIES WILL_FAIL TRUE)
+ at CMAKELISTS_EXTRA_CODE@
diff --git a/Tests/RunCMake/ctest_test/RunCMakeTest.cmake b/Tests/RunCMake/ctest_test/RunCMakeTest.cmake
index 24edbd2..bb0d5cf 100644
--- a/Tests/RunCMake/ctest_test/RunCMakeTest.cmake
+++ b/Tests/RunCMake/ctest_test/RunCMakeTest.cmake
@@ -7,5 +7,11 @@ function(run_ctest_test CASE_NAME)
run_ctest(${CASE_NAME})
endfunction()
-run_ctest_test(TestQuiet QUIET EXCLUDE Fail)
+run_ctest_test(TestQuiet QUIET)
+
+set(CMAKELISTS_EXTRA_CODE "
+add_test(NAME CMakeVersionFail COMMAND \"${CMAKE_COMMAND}\" --version)
+set_tests_properties(CMakeVersionFail PROPERTIES WILL_FAIL TRUE)
+")
run_ctest_test(TestFail INCLUDE Fail)
+set(CMAKELISTS_EXTRA_CODE "")
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f5de2d8e8a097319e6d1e9db23b19e9edb3e6c5a
commit f5de2d8e8a097319e6d1e9db23b19e9edb3e6c5a
Author: Zack Galbreath <zack.galbreath at kitware.com>
AuthorDate: Wed Feb 25 11:07:57 2015 -0500
Commit: Zack Galbreath <zack.galbreath at kitware.com>
CommitDate: Wed Feb 25 11:14:52 2015 -0500
remove redundant calls to SetScriptErrorOccurred
diff --git a/Source/CTest/cmCTestSubmitHandler.cxx b/Source/CTest/cmCTestSubmitHandler.cxx
index ddb5f4c..36ef199 100644
--- a/Source/CTest/cmCTestSubmitHandler.cxx
+++ b/Source/CTest/cmCTestSubmitHandler.cxx
@@ -235,7 +235,6 @@ bool cmCTestSubmitHandler::SubmitUsingFTP(const std::string& localprefix,
<< local_file << std::endl);
::curl_easy_cleanup(curl);
::curl_global_cleanup();
- this->SetScriptErrorOccurred(true);
return false;
}
unsigned long filelen = cmSystemTools::FileLength(local_file);
@@ -315,7 +314,6 @@ bool cmCTestSubmitHandler::SubmitUsingFTP(const std::string& localprefix,
*this->LogFile << std::endl;
::curl_easy_cleanup(curl);
::curl_global_cleanup();
- this->SetScriptErrorOccurred(true);
return false;
}
// always cleanup
@@ -479,7 +477,6 @@ bool cmCTestSubmitHandler::SubmitUsingHTTP(const std::string& localprefix,
<< local_file << std::endl);
::curl_easy_cleanup(curl);
::curl_global_cleanup();
- this->SetScriptErrorOccurred(true);
return false;
}
unsigned long filelen = cmSystemTools::FileLength(local_file);
@@ -624,7 +621,6 @@ bool cmCTestSubmitHandler::SubmitUsingHTTP(const std::string& localprefix,
}
::curl_easy_cleanup(curl);
::curl_global_cleanup();
- this->SetScriptErrorOccurred(true);
return false;
}
// always cleanup
@@ -787,7 +783,6 @@ bool cmCTestSubmitHandler::TriggerUsingHTTP(
}
::curl_easy_cleanup(curl);
::curl_global_cleanup();
- this->SetScriptErrorOccurred(true);
return false;
}
@@ -913,7 +908,6 @@ bool cmCTestSubmitHandler::SubmitUsingSCP(
cmsysProcess_Delete(cp);
if ( problems )
{
- this->SetScriptErrorOccurred(true);
return false;
}
return true;
@@ -935,8 +929,7 @@ bool cmCTestSubmitHandler::SubmitUsingCP(
<< "\tNumber of files: " << files.size() << "\n"
<< "\tremoteprefix: " << remoteprefix << "\n"
<< "\tdestination: " << destination << std::endl);
- this->SetScriptErrorOccurred(true);
- return 0;
+ return false;
}
cmCTest::SetOfStrings::const_iterator file;
@@ -1003,7 +996,6 @@ bool cmCTestSubmitHandler::SubmitUsingXMLRPC(const std::string& localprefix,
{
cmCTestLog(this->CTest, ERROR_MESSAGE, " Cannot find file: "
<< local_file.c_str() << std::endl);
- this->SetScriptErrorOccurred(true);
return false;
}
@@ -1014,7 +1006,6 @@ bool cmCTestSubmitHandler::SubmitUsingXMLRPC(const std::string& localprefix,
{
cmCTestLog(this->CTest, ERROR_MESSAGE, " File too big: "
<< local_file.c_str() << std::endl);
- this->SetScriptErrorOccurred(true);
return false;
}
size_t fileSize = static_cast<size_t>(st.st_size);
@@ -1023,7 +1014,6 @@ bool cmCTestSubmitHandler::SubmitUsingXMLRPC(const std::string& localprefix,
{
cmCTestLog(this->CTest, ERROR_MESSAGE, " Cannot open file: "
<< local_file.c_str() << std::endl);
- this->SetScriptErrorOccurred(true);
return false;
}
@@ -1034,7 +1024,6 @@ bool cmCTestSubmitHandler::SubmitUsingXMLRPC(const std::string& localprefix,
fclose(fp);
cmCTestLog(this->CTest, ERROR_MESSAGE, " Cannot read file: "
<< local_file.c_str() << std::endl);
- this->SetScriptErrorOccurred(true);
return false;
}
fclose(fp);
@@ -1052,7 +1041,6 @@ bool cmCTestSubmitHandler::SubmitUsingXMLRPC(const std::string& localprefix,
<< env.fault_string << " (" << env.fault_code << ")" << std::endl);
xmlrpc_env_clean(&env);
xmlrpc_client_cleanup();
- this->SetScriptErrorOccurred(true);
return false;
}
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=614e2d3488b1306051f562e98c103a3a137773b0
commit 614e2d3488b1306051f562e98c103a3a137773b0
Author: Zack Galbreath <zack.galbreath at kitware.com>
AuthorDate: Wed Feb 25 10:58:19 2015 -0500
Commit: Zack Galbreath <zack.galbreath at kitware.com>
CommitDate: Wed Feb 25 11:14:28 2015 -0500
remove some calls to SetScriptErrorOccurred
This should only be called for errors that the site maintainer
could reasonably be expected to fix.
diff --git a/Source/CTest/cmCTestCoverageHandler.cxx b/Source/CTest/cmCTestCoverageHandler.cxx
index ea95401..bb31bc7 100644
--- a/Source/CTest/cmCTestCoverageHandler.cxx
+++ b/Source/CTest/cmCTestCoverageHandler.cxx
@@ -458,7 +458,6 @@ int cmCTestCoverageHandler::ProcessHandler()
{
cmCTestLog(this->CTest, ERROR_MESSAGE,
"Cannot open coverage summary file." << std::endl);
- this->SetScriptErrorOccurred(true);
return -1;
}
@@ -526,7 +525,6 @@ int cmCTestCoverageHandler::ProcessHandler()
{
cmCTestLog(this->CTest, ERROR_MESSAGE, "Cannot find file: "
<< fullFileName << std::endl);
- this->SetScriptErrorOccurred(true);
continue;
}
@@ -688,7 +686,6 @@ int cmCTestCoverageHandler::ProcessHandler()
cmCTestLog(this->CTest, ERROR_MESSAGE,
" " << *erIt << std::endl);
}
- this->SetScriptErrorOccurred(true);
}
long total_lines = total_tested + total_untested;
@@ -1118,7 +1115,6 @@ int cmCTestCoverageHandler::HandleGCovCoverage(
cmCTestLog(this->CTest, ERROR_MESSAGE,
"Command produced error: " << errors << std::endl);
cont->Error ++;
- this->SetScriptErrorOccurred(true);
continue;
}
if ( retVal != 0 )
@@ -1127,7 +1123,6 @@ int cmCTestCoverageHandler::HandleGCovCoverage(
<< retVal << " while processing: " << *it << std::endl);
cmCTestLog(this->CTest, ERROR_MESSAGE,
"Command produced error: " << cont->Error << std::endl);
- this->SetScriptErrorOccurred(true);
}
cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
"--------------------------------------------------------------"
@@ -1164,7 +1159,6 @@ int cmCTestCoverageHandler::HandleGCovCoverage(
cmCTestLog(this->CTest, ERROR_MESSAGE, "Unknown gcov output style e1"
<< std::endl);
cont->Error ++;
- this->SetScriptErrorOccurred(true);
break;
}
@@ -1182,7 +1176,6 @@ int cmCTestCoverageHandler::HandleGCovCoverage(
cmCTestLog(this->CTest, ERROR_MESSAGE, "Unknown gcov output style e2"
<< std::endl);
cont->Error ++;
- this->SetScriptErrorOccurred(true);
break;
}
@@ -1199,7 +1192,6 @@ int cmCTestCoverageHandler::HandleGCovCoverage(
cmCTestLog(this->CTest, ERROR_MESSAGE, "Unknown gcov output style e3"
<< std::endl);
cont->Error ++;
- this->SetScriptErrorOccurred(true);
break;
}
@@ -1217,7 +1209,6 @@ int cmCTestCoverageHandler::HandleGCovCoverage(
cmCTestLog(this->CTest, ERROR_MESSAGE, "Unknown gcov output style e4"
<< std::endl);
cont->Error ++;
- this->SetScriptErrorOccurred(true);
break;
}
}
@@ -1232,7 +1223,6 @@ int cmCTestCoverageHandler::HandleGCovCoverage(
cmCTestLog(this->CTest, ERROR_MESSAGE, "Unknown gcov output style e5"
<< std::endl);
cont->Error ++;
- this->SetScriptErrorOccurred(true);
break;
}
@@ -1249,7 +1239,6 @@ int cmCTestCoverageHandler::HandleGCovCoverage(
cmCTestLog(this->CTest, ERROR_MESSAGE, "Unknown gcov output style e6"
<< std::endl);
cont->Error ++;
- this->SetScriptErrorOccurred(true);
break;
}
@@ -1267,7 +1256,6 @@ int cmCTestCoverageHandler::HandleGCovCoverage(
cmCTestLog(this->CTest, ERROR_MESSAGE, "Unknown gcov output style e7"
<< std::endl);
cont->Error ++;
- this->SetScriptErrorOccurred(true);
break;
}
@@ -1285,7 +1273,6 @@ int cmCTestCoverageHandler::HandleGCovCoverage(
cmCTestLog(this->CTest, ERROR_MESSAGE, "Unknown gcov output style e8"
<< std::endl);
cont->Error ++;
- this->SetScriptErrorOccurred(true);
break;
}
@@ -1303,7 +1290,6 @@ int cmCTestCoverageHandler::HandleGCovCoverage(
cmCTestLog(this->CTest, ERROR_MESSAGE,
"Unknown gcov output line: [" << *line << "]"
<< std::endl);
- this->SetScriptErrorOccurred(true);
cont->Error ++;
//abort();
}
@@ -1327,7 +1313,6 @@ int cmCTestCoverageHandler::HandleGCovCoverage(
{
cmCTestLog(this->CTest, ERROR_MESSAGE, "Cannot open file: "
<< gcovFile << std::endl);
- this->SetScriptErrorOccurred(true);
}
else
{
@@ -1544,7 +1529,6 @@ int cmCTestCoverageHandler::HandleLCovCoverage(
cmCTestLog(this->CTest, ERROR_MESSAGE,
"Command produced error: " << errors << std::endl);
cont->Error ++;
- this->SetScriptErrorOccurred(true);
continue;
}
if ( retVal != 0 )
@@ -1553,7 +1537,6 @@ int cmCTestCoverageHandler::HandleLCovCoverage(
<< retVal << " while processing: " << *it << std::endl);
cmCTestLog(this->CTest, ERROR_MESSAGE,
"Command produced error: " << cont->Error << std::endl);
- this->SetScriptErrorOccurred(true);
}
cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
"--------------------------------------------------------------"
@@ -1604,7 +1587,6 @@ int cmCTestCoverageHandler::HandleLCovCoverage(
{
cmCTestLog(this->CTest, ERROR_MESSAGE, "Cannot open file: "
<< lcovFile << std::endl);
- this->SetScriptErrorOccurred(true);
}
std::string srcname;
@@ -1614,7 +1596,6 @@ int cmCTestCoverageHandler::HandleLCovCoverage(
cmCTestLog(this->CTest, ERROR_MESSAGE,
"Error while parsing lcov file '" << lcovFile << "':"
<< " No source file name found!" << std::endl);
- this->SetScriptErrorOccurred(true);
return 0;
}
srcname = srcname.substr(18);
@@ -1648,7 +1629,6 @@ int cmCTestCoverageHandler::HandleLCovCoverage(
{
cmCTestLog(this->CTest, ERROR_MESSAGE, "Cannot open file: "
<< lcovFile << std::endl);
- this->SetScriptErrorOccurred(true);
}
else
{
@@ -1824,7 +1804,6 @@ int cmCTestCoverageHandler::HandleTracePyCoverage(
cmCTestLog(this->CTest, ERROR_MESSAGE,
"Cannot find source Python file corresponding to: "
<< *fileIt << std::endl);
- this->SetScriptErrorOccurred(true);
continue;
}
@@ -1842,7 +1821,6 @@ int cmCTestCoverageHandler::HandleTracePyCoverage(
{
cmCTestLog(this->CTest, ERROR_MESSAGE, "Cannot open file: "
<< *fileIt << std::endl);
- this->SetScriptErrorOccurred(true);
}
else
{
@@ -1879,7 +1857,6 @@ int cmCTestCoverageHandler::HandleTracePyCoverage(
cmCTestLog(this->CTest, ERROR_MESSAGE,
"Currently the limit is maximum coverage of 999999"
<< std::endl);
- this->SetScriptErrorOccurred(true);
}
}
}
@@ -1974,7 +1951,6 @@ int cmCTestCoverageHandler::RunBullseyeCoverageBranch(
{
cmCTestLog(this->CTest, ERROR_MESSAGE,
"Files and full path files not the same size?:\n");
- this->SetScriptErrorOccurred(true);
return 0;
}
// create the output stream for the CoverageLog-N.xml file
@@ -1982,7 +1958,6 @@ int cmCTestCoverageHandler::RunBullseyeCoverageBranch(
int logFileCount = 0;
if ( !this->StartCoverageLogFile(covLogFile, logFileCount) )
{
- this->SetScriptErrorOccurred(true);
return -1;
}
// for each file run covbr on that file to get the coverage
@@ -1994,7 +1969,6 @@ int cmCTestCoverageHandler::RunBullseyeCoverageBranch(
if(!this->RunBullseyeCommand(cont, "covbr", 0, outputFile))
{
cmCTestLog(this->CTest, ERROR_MESSAGE, "error running covbr for." << "\n");
- this->SetScriptErrorOccurred(true);
return -1;
}
cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
@@ -2006,7 +1980,6 @@ int cmCTestCoverageHandler::RunBullseyeCoverageBranch(
cmCTestLog(this->CTest, ERROR_MESSAGE,
"Cannot open coverage file: " <<
outputFile << std::endl);
- this->SetScriptErrorOccurred(true);
return 0;
}
std::map<std::string, std::string> fileMap;
@@ -2119,7 +2092,6 @@ int cmCTestCoverageHandler::RunBullseyeCommand(
if(program.empty())
{
cmCTestLog(this->CTest, ERROR_MESSAGE, "Cannot find :" << cmd << "\n");
- this->SetScriptErrorOccurred(true);
return 0;
}
if(arg)
@@ -2151,7 +2123,6 @@ int cmCTestCoverageHandler::RunBullseyeCommand(
<< program << " " << arg << "\n"
<< "kwsys process state : "
<< runCoverageSrc.GetProcessState());
- this->SetScriptErrorOccurred(true);
return 0;
}
// since we set the output file names wait for it to end
@@ -2169,7 +2140,6 @@ int cmCTestCoverageHandler::RunBullseyeSourceSummary(
if(!this->RunBullseyeCommand(cont, "covsrc", "-c", outputFile))
{
cmCTestLog(this->CTest, ERROR_MESSAGE, "error running covsrc:\n");
- this->SetScriptErrorOccurred(true);
return 0;
}
@@ -2180,7 +2150,6 @@ int cmCTestCoverageHandler::RunBullseyeSourceSummary(
{
cmCTestLog(this->CTest, ERROR_MESSAGE,
"Cannot open coverage summary file." << std::endl);
- this->SetScriptErrorOccurred(true);
return 0;
}
this->CTest->StartXML(covSumFile, this->AppendXML);
@@ -2221,7 +2190,6 @@ int cmCTestCoverageHandler::RunBullseyeSourceSummary(
cmCTestLog(this->CTest, ERROR_MESSAGE,
"Cannot open coverage summary file: " <<
outputFile << std::endl);
- this->SetScriptErrorOccurred(true);
return 0;
}
std::set<std::string> coveredFileNames;
@@ -2386,7 +2354,6 @@ int cmCTestCoverageHandler::HandleBullseyeCoverage(
{
cmCTestLog(this->CTest, ERROR_MESSAGE,
"Error running bullseye summary.\n");
- this->SetScriptErrorOccurred(true);
return 0;
}
cmCTestOptionalLog(this->CTest, DEBUG, "HandleBullseyeCoverage return 1 "
@@ -2425,7 +2392,6 @@ bool cmCTestCoverageHandler::ParseBullsEyeCovsrcLine(
{
cmCTestLog(this->CTest, ERROR_MESSAGE, "Error parsing string : "
<< inputLine << "\n");
- this->SetScriptErrorOccurred(true);
return false;
}
// the source file has "" around it so extract out the file name
@@ -2461,7 +2427,6 @@ bool cmCTestCoverageHandler::ParseBullsEyeCovsrcLine(
cmCTestLog(this->CTest, ERROR_MESSAGE, "Error parsing input : "
<< inputLine << " last pos not npos = " << pos <<
"\n");
- this->SetScriptErrorOccurred(true);
}
return true;
}
diff --git a/Source/CTest/cmCTestMemCheckHandler.cxx b/Source/CTest/cmCTestMemCheckHandler.cxx
index f603297..c7b2210 100644
--- a/Source/CTest/cmCTestMemCheckHandler.cxx
+++ b/Source/CTest/cmCTestMemCheckHandler.cxx
@@ -51,7 +51,6 @@ static void xmlReportError(int line, const char* msg, void* data)
cmCTestLog(ctest, ERROR_MESSAGE,
"Error parsing XML in stream at line "
<< line << ": " << msg << std::endl);
- ctest->GetHandler("memcheck")->SetScriptErrorOccurred(true);
}
// parse the xml file containing the results of last BoundsChecker run
@@ -112,7 +111,6 @@ public:
this->Errors.push_back(cmCTestMemCheckHandler::ABW); // do not know
cmCTestLog(this->CTest, ERROR_MESSAGE,
"No Category found in Bounds checker XML\n" );
- this->CTest->GetHandler("memcheck")->SetScriptErrorOccurred(true);
return;
}
while(ptr->ErrorCategory && cat)
@@ -130,7 +128,6 @@ public:
cmCTestLog(this->CTest, ERROR_MESSAGE,
"Found unknown Bounds Checker error "
<< ptr->ErrorCategory << std::endl);
- this->CTest->GetHandler("memcheck")->SetScriptErrorOccurred(true);
}
}
cmCTest* CTest;
@@ -916,7 +913,6 @@ bool cmCTestMemCheckHandler::ProcessMemCheckPurifyOutput(
<< pfW.match(1) << std::endl);
ostr << "*** Unknown Purify memory fault: " << pfW.match(1)
<< std::endl;
- this->SetScriptErrorOccurred(true);
}
}
if ( failure != this->ResultStrings.size() )
@@ -1152,7 +1148,6 @@ bool cmCTestMemCheckHandler::ProcessMemCheckBoundsCheckerOutput(
cmCTestLog(this->CTest, ERROR_MESSAGE,
"Error in ParseChunk: " << theLine
<< std::endl);
- this->SetScriptErrorOccurred(true);
}
}
}
@@ -1227,7 +1222,6 @@ cmCTestMemCheckHandler::PostProcessBoundsCheckerTest(cmCTestTestResult& res,
{
std::string log = "Cannot read memory tester output file: " + ofile;
cmCTestLog(this->CTest, ERROR_MESSAGE, log.c_str() << std::endl);
- this->SetScriptErrorOccurred(true);
return;
}
res.Output += BOUNDS_CHECKER_MARKER;
@@ -1263,7 +1257,6 @@ cmCTestMemCheckHandler::AppendMemTesterOutput(cmCTestTestResult& res,
{
std::string log = "Cannot read memory tester output file: " + ofile;
cmCTestLog(this->CTest, ERROR_MESSAGE, log.c_str() << std::endl);
- this->SetScriptErrorOccurred(true);
return;
}
std::string line;
diff --git a/Tests/RunCMake/ctest_memcheck/DummyBC-result.txt b/Tests/RunCMake/ctest_memcheck/DummyBC-result.txt
deleted file mode 100644
index b57e2de..0000000
--- a/Tests/RunCMake/ctest_memcheck/DummyBC-result.txt
+++ /dev/null
@@ -1 +0,0 @@
-(-1|255)
-----------------------------------------------------------------------
Summary of changes:
Source/CTest/cmCTestCoverageHandler.cxx | 35 ----------------------
Source/CTest/cmCTestMemCheckHandler.cxx | 7 -----
Source/CTest/cmCTestSubmitHandler.cxx | 14 +--------
Tests/RunCMake/ctest_build/CMakeLists.txt.in | 5 ++--
Tests/RunCMake/ctest_build/RunCMakeTest.cmake | 6 ++++
Tests/RunCMake/ctest_memcheck/DummyBC-result.txt | 1 -
Tests/RunCMake/ctest_test/CMakeLists.txt.in | 4 +--
Tests/RunCMake/ctest_test/RunCMakeTest.cmake | 8 ++++-
8 files changed, 17 insertions(+), 63 deletions(-)
delete mode 100644 Tests/RunCMake/ctest_memcheck/DummyBC-result.txt
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list