[Cmake-commits] [cmake-commits] alex committed cmCTestScriptHandler.cxx 1.50 1.51
cmake-commits at cmake.org
cmake-commits at cmake.org
Sun Jul 12 04:51:53 EDT 2009
Update of /cvsroot/CMake/CMake/Source/CTest
In directory public:/mounts/ram/cvs-serv7972/Source/CTest
Modified Files:
cmCTestScriptHandler.cxx
Log Message:
STYLE: don't load CMakeDetermineSystem and CMakeSystemSpecific directly from
cmCTestScriptHandler, but have it load the new script CTestScriptMode.cmake
-> that makes it more flexible, also add a simple test that the system name
has been determined correctly
Alex
Index: cmCTestScriptHandler.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestScriptHandler.cxx,v
retrieving revision 1.50
retrieving revision 1.51
diff -C 2 -d -r1.50 -r1.51
*** cmCTestScriptHandler.cxx 11 Jul 2009 20:30:18 -0000 1.50
--- cmCTestScriptHandler.cxx 12 Jul 2009 08:51:50 -0000 1.51
***************
*** 419,428 ****
! /* Execute CMakeDetermineSystem and CMakeSystemSpecificInformation, so
that variables like CMAKE_SYSTEM and also the search paths for libraries,
header and executables are set correctly and can be used. Makes new-style
ctest scripting easier. */
std::string systemFile =
! this->Makefile->GetModulesFile("CMakeDetermineSystem.cmake");
if (!this->Makefile->ReadListFile(0, systemFile.c_str()) ||
cmSystemTools::GetErrorOccuredFlag())
--- 419,429 ----
! /* Execute CTestScriptMode.cmake, which loads CMakeDetermineSystem and
! CMakeSystemSpecificInformation, so
that variables like CMAKE_SYSTEM and also the search paths for libraries,
header and executables are set correctly and can be used. Makes new-style
ctest scripting easier. */
std::string systemFile =
! this->Makefile->GetModulesFile("CTestScriptMode.cmake");
if (!this->Makefile->ReadListFile(0, systemFile.c_str()) ||
cmSystemTools::GetErrorOccuredFlag())
***************
*** 433,446 ****
}
- systemFile =
- this->Makefile->GetModulesFile("CMakeSystemSpecificInformation.cmake");
- if (!this->Makefile->ReadListFile(0, systemFile.c_str()) ||
- cmSystemTools::GetErrorOccuredFlag())
- {
- cmCTestLog(this->CTest, ERROR_MESSAGE, "Error in read:"
- << systemFile.c_str() << "\n");
- return 2;
- }
-
// finally read in the script
if (!this->Makefile->ReadListFile(0, script.c_str()) ||
--- 434,437 ----
***************
*** 967,971 ****
cmCTestLog(this->CTest, ERROR_MESSAGE,
"Unable to run ctest:" << std::endl
! << output.c_str() << std::endl);
if (!res)
{
--- 958,963 ----
cmCTestLog(this->CTest, ERROR_MESSAGE,
"Unable to run ctest:" << std::endl
! << "command: " << command.c_str() << std::endl
! << "output: " << output.c_str() << std::endl);
if (!res)
{
More information about the Cmake-commits
mailing list