[cmake-commits] hoffman committed cmCTestBuildAndTestHandler.cxx
1.11.2.1 1.11.2.2 cmCTestBuildHandler.cxx 1.42.2.3 1.42.2.4
cmCTestCoverageHandler.cxx 1.31 1.31.2.1
cmCTestHandlerCommand.cxx 1.7.2.2 1.7.2.3
cmCTestScriptHandler.cxx 1.31.2.3 1.31.2.4
cmCTestStartCommand.cxx 1.12.2.2 1.12.2.3
cmCTestTestHandler.cxx 1.41.2.3 1.41.2.4
cmake-commits at cmake.org
cmake-commits at cmake.org
Fri Oct 13 10:52:09 EDT 2006
Update of /cvsroot/CMake/CMake/Source/CTest
In directory public:/mounts/ram/cvs-serv31017/Source/CTest
Modified Files:
Tag: CMake-2-4
cmCTestBuildAndTestHandler.cxx cmCTestBuildHandler.cxx
cmCTestCoverageHandler.cxx cmCTestHandlerCommand.cxx
cmCTestScriptHandler.cxx cmCTestStartCommand.cxx
cmCTestTestHandler.cxx
Log Message:
ENH: merge changes from the main tree to the 2.4 branch
Index: cmCTestStartCommand.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestStartCommand.cxx,v
retrieving revision 1.12.2.2
retrieving revision 1.12.2.3
diff -u -d -r1.12.2.2 -r1.12.2.3
--- cmCTestStartCommand.cxx 24 Jul 2006 15:19:36 -0000 1.12.2.2
+++ cmCTestStartCommand.cxx 13 Oct 2006 14:52:07 -0000 1.12.2.3
@@ -76,6 +76,10 @@
"as an argument or set CTEST_BINARY_DIRECTORY");
return false;
}
+
+ cmSystemTools::AddKeepPath(src_dir);
+ cmSystemTools::AddKeepPath(bld_dir);
+
this->CTest->EmptyCTestConfiguration();
this->CTest->SetCTestConfiguration("SourceDirectory",
cmSystemTools::CollapseFullPath(src_dir).c_str());
Index: cmCTestBuildAndTestHandler.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestBuildAndTestHandler.cxx,v
retrieving revision 1.11.2.1
retrieving revision 1.11.2.2
diff -u -d -r1.11.2.1 -r1.11.2.2
--- cmCTestBuildAndTestHandler.cxx 30 Jun 2006 17:48:46 -0000 1.11.2.1
+++ cmCTestBuildAndTestHandler.cxx 13 Oct 2006 14:52:07 -0000 1.11.2.2
@@ -117,6 +117,9 @@
return 1;
}
}
+ out << "======== CMake output ======\n";
+ out << cmakeOutString;
+ out << "======== End CMake output ======\n";
return 0;
}
Index: cmCTestScriptHandler.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestScriptHandler.cxx,v
retrieving revision 1.31.2.3
retrieving revision 1.31.2.4
diff -u -d -r1.31.2.3 -r1.31.2.4
--- cmCTestScriptHandler.cxx 24 Jul 2006 15:19:36 -0000 1.31.2.3
+++ cmCTestScriptHandler.cxx 13 Oct 2006 14:52:07 -0000 1.31.2.4
@@ -385,6 +385,11 @@
= this->Makefile->GetSafeDefinition("CTEST_SOURCE_DIRECTORY");
this->BinaryDir
= this->Makefile->GetSafeDefinition("CTEST_BINARY_DIRECTORY");
+
+ // add in translations for src and bin
+ cmSystemTools::AddKeepPath(this->SourceDir.c_str());
+ cmSystemTools::AddKeepPath(this->BinaryDir.c_str());
+
this->CTestCmd
= this->Makefile->GetSafeDefinition("CTEST_COMMAND");
this->CVSCheckOut
Index: cmCTestHandlerCommand.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestHandlerCommand.cxx,v
retrieving revision 1.7.2.2
retrieving revision 1.7.2.3
diff -u -d -r1.7.2.2 -r1.7.2.3
--- cmCTestHandlerCommand.cxx 24 Jul 2006 15:19:36 -0000 1.7.2.2
+++ cmCTestHandlerCommand.cxx 13 Oct 2006 14:52:07 -0000 1.7.2.3
@@ -48,7 +48,9 @@
cmCTestGenericHandler* handler = this->InitializeHandler();
if ( !handler )
{
- this->SetError("internal CTest error. Cannot instantiate test handler");
+ cmCTestLog(this->CTest, ERROR_MESSAGE,
+ "Cannot instantiate test handler " << this->GetName()
+ << std::endl);
return false;
}
Index: cmCTestCoverageHandler.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestCoverageHandler.cxx,v
retrieving revision 1.31
retrieving revision 1.31.2.1
diff -u -d -r1.31 -r1.31.2.1
--- cmCTestCoverageHandler.cxx 29 Mar 2006 17:01:24 -0000 1.31
+++ cmCTestCoverageHandler.cxx 13 Oct 2006 14:52:07 -0000 1.31.2.1
@@ -254,6 +254,7 @@
cmCTestLog(this->CTest, ERROR_MESSAGE, " Cannot find any coverage files."
<< std::endl);
// No coverage files is a valid thing, so the exit code is 0
+ cmSystemTools::ChangeDirectory(currentDirectory.c_str());
return 0;
}
@@ -602,7 +603,7 @@
{
cmCTestLog(this->CTest, ERROR_MESSAGE,
"Cannot open coverage summary file." << std::endl);
-
+ cmSystemTools::ChangeDirectory(currentDirectory.c_str());
return -1;
}
@@ -615,6 +616,7 @@
int logFileCount = 0;
if ( !this->StartCoverageLogFile(covLogFile, logFileCount) )
{
+ cmSystemTools::ChangeDirectory(currentDirectory.c_str());
return -1;
}
totalCoverageMap::iterator fileIterator;
@@ -650,6 +652,7 @@
logFileCount ++;
if ( !this->StartCoverageLogFile(covLogFile, logFileCount) )
{
+ cmSystemTools::ChangeDirectory(currentDirectory.c_str());
return -1;
}
}
Index: cmCTestTestHandler.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestTestHandler.cxx,v
retrieving revision 1.41.2.3
retrieving revision 1.41.2.4
diff -u -d -r1.41.2.3 -r1.41.2.4
--- cmCTestTestHandler.cxx 27 Jul 2006 14:37:10 -0000 1.41.2.3
+++ cmCTestTestHandler.cxx 13 Oct 2006 14:52:07 -0000 1.41.2.4
@@ -451,7 +451,8 @@
cmCTestLog(this->CTest, HANDLER_OUTPUT,
(this->MemCheck ? "Memory check" : "Test")
- << " project" << std::endl);
+ << " project " << cmSystemTools::GetCurrentWorkingDirectory()
+ << std::endl);
if ( ! this->PreProcessHandler() )
{
return -1;
Index: cmCTestBuildHandler.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestBuildHandler.cxx,v
retrieving revision 1.42.2.3
retrieving revision 1.42.2.4
diff -u -d -r1.42.2.3 -r1.42.2.4
--- cmCTestBuildHandler.cxx 24 Jul 2006 15:19:36 -0000 1.42.2.3
+++ cmCTestBuildHandler.cxx 13 Oct 2006 14:52:07 -0000 1.42.2.4
@@ -37,6 +37,9 @@
#include <math.h>
#include <float.h>
+#if defined(__BORLANDC__)
+# pragma warn -8060 /* possibly incorrect assignment */
+#endif
static const char* cmCTestErrorMatches[] = {
"^[Bb]us [Ee]rror",
@@ -72,7 +75,7 @@
": Can't find library for",
": internal link edit command failed",
": Unrecognized option \\`.*\\'",
- "\", line [0-9]+\\.[0-9]+: [0-9]+-[0-9]+ \\([^W]\\)",
+ "\", line [0-9]+\\.[0-9]+: [0-9]+-[0-9]+ \\([^WI]\\)",
"ld: 0706-006 Cannot find or open library file: -l ",
"ild: \\(argument error\\) can't find library argument ::",
"^could not be found and will not be loaded.",
@@ -116,7 +119,7 @@
"WARNING: ",
"([^ :]+) : warning",
"([^:]+): warning",
- "\", line [0-9]+\\.[0-9]+: [0-9]+-[0-9]+ \\(W\\)",
+ "\", line [0-9]+\\.[0-9]+: [0-9]+-[0-9]+ \\([WI]\\)",
"^cxx: Warning:",
".*file: .* has no symbols",
"([^ :]+):([0-9]+): (Warning|Warnung)",
More information about the Cmake-commits
mailing list