kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ENH: add more debug stuff to CTestCTest2 so I can figure out redwall

This commit is contained in:
Bill Hoffman 2008-11-23 10:49:46 -05:00
parent b29265a6b9
commit bdfc3fadd3
4 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/CTest/cmCTestCoverageHandler.cxx
View File

@ -1641,6 +1641,8 @@ int cmCTestCoverageHandler::HandleBullseyeCoverage(
"Error running bullseye summary.\n");
return 0;
}
cmCTestLog(this->CTest, DEBUG, "HandleBullseyeCoverage return 1 "
<< std::endl);
return 1;
}

5
Source/CTest/cmCTestScriptHandler.cxx
View File

@ -397,6 +397,8 @@ int cmCTestScriptHandler::ReadInScript(const std::string& total_script_arg)
if (!this->Makefile->ReadListFile(0, systemFile.c_str()) ||
cmSystemTools::GetErrorOccuredFlag())
{
cmCTestLog(this->CTest, DEBUG, "Error in read: " << systemFile.c_str()
<< std::endl);
return 2;
}
@ -404,6 +406,9 @@ int cmCTestScriptHandler::ReadInScript(const std::string& total_script_arg)
if (!this->Makefile->ReadListFile(0, script.c_str()) ||
cmSystemTools::GetErrorOccuredFlag())
{
cmCTestLog(this->CTest, DEBUG, "Error in read script: "
<< script.c_str()
<< std::endl);
return 2;
}

16
Source/cmCTest.cxx
View File

@ -1981,6 +1981,11 @@ int cmCTest::Run(std::vector<std::string> &args, std::string* output)
#ifdef CMAKE_BUILD_WITH_CMAKE
cmDynamicLoader::FlushCache();
#endif
if(retv != 0)
{
cmCTestLog(this, DEBUG, "build and test failing returing: " << retv
<< std::endl);
}
return retv;
}
@ -2005,6 +2010,12 @@ int cmCTest::Run(std::vector<std::string> &args, std::string* output)
}
this->GetHandler("script")->SetVerbose(this->Verbose);
res = this->GetHandler("script")->ProcessHandler();
if(res != 0)
{
cmCTestLog(this, DEBUG, "running script failing returing: " << res
<< std::endl);
}
}
else
{
@ -2033,6 +2044,11 @@ int cmCTest::Run(std::vector<std::string> &args, std::string* output)
}
this->Finalize();
}
if(res != 0)
{
cmCTestLog(this, DEBUG, "Running a test(s) failed returning : " << res
<< std::endl);
}
return res;
}

2
Tests/CMakeLists.txt
View File

@ -889,7 +889,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=CVS -P ${CMake_SOURCE_DIR}/Utilities/Rel
CONFIGURE_FILE("${CMake_SOURCE_DIR}/Tests/CTestTest2/test.cmake.in"
"${CMake_BINARY_DIR}/Tests/CTestTest2/test.cmake" @ONLY ESCAPE_QUOTES)
ADD_TEST(CTestTest2 ${CMAKE_CTEST_COMMAND}
-S "${CMake_BINARY_DIR}/Tests/CTestTest2/test.cmake" -VV
-S "${CMake_BINARY_DIR}/Tests/CTestTest2/test.cmake" -VV --debug
--output-log "${CMake_BINARY_DIR}/Tests/CTestTest2/testOutput.log"
)
CONFIGURE_FILE("${CMake_SOURCE_DIR}/Tests/CTestTest3/test.cmake.in"