summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Hoffman <bill.hoffman@kitware.com>2008-11-23 15:49:46 (GMT)
committerBill Hoffman <bill.hoffman@kitware.com>2008-11-23 15:49:46 (GMT)
commitbdfc3fadd321c6642e37fc074e5ebd4a5f533787 (patch)
treedcb94b8d9e6ab9cbc9a9bb1b76f0cad6398f6981
parentb29265a6b97fd02111809ef1713175a7807d1356 (diff)
downloadCMake-bdfc3fadd321c6642e37fc074e5ebd4a5f533787.zip
CMake-bdfc3fadd321c6642e37fc074e5ebd4a5f533787.tar.gz
CMake-bdfc3fadd321c6642e37fc074e5ebd4a5f533787.tar.bz2
ENH: add more debug stuff to CTestCTest2 so I can figure out redwall
-rw-r--r--Source/CTest/cmCTestCoverageHandler.cxx2
-rw-r--r--Source/CTest/cmCTestScriptHandler.cxx5
-rw-r--r--Source/cmCTest.cxx16
-rw-r--r--Tests/CMakeLists.txt2
4 files changed, 24 insertions, 1 deletions
diff --git a/Source/CTest/cmCTestCoverageHandler.cxx b/Source/CTest/cmCTestCoverageHandler.cxx
index e1b70ec..86534d7 100644
--- a/Source/CTest/cmCTestCoverageHandler.cxx
+++ b/Source/CTest/cmCTestCoverageHandler.cxx
@@ -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;
}
diff --git a/Source/CTest/cmCTestScriptHandler.cxx b/Source/CTest/cmCTestScriptHandler.cxx
index 67b171b..db54c92 100644
--- a/Source/CTest/cmCTestScriptHandler.cxx
+++ b/Source/CTest/cmCTestScriptHandler.cxx
@@ -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;
}
diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx
index d8d9668..049248e 100644
--- a/Source/cmCTest.cxx
+++ b/Source/cmCTest.cxx
@@ -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;
}
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index a45ce4b..1035427 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -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"