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

ENH: use CTestTestfile.txt

Browse Source
This commit is contained in:
Ken Martin 2008-01-17 12:44:59 -05:00
parent 14fc7dd1dd
commit 456631225b
3 changed files with 6 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Source/CTest/cmCTestTestHandler.cxx
View File

@ -98,14 +98,9 @@ bool cmCTestSubdirCommand::InitialPass(std::vector<std::string> const& args)
// does the CTestTestfile.cmake exist ? // does the CTestTestfile.cmake exist ?
testFilename = "CTestTestfile.cmake"; testFilename = "CTestTestfile.cmake";
} }
else if( cmSystemTools::FileExists("DartTestfile.txt") )
{
// does the DartTestfile.txt exist ?
testFilename = "DartTestfile.txt";
}
else else
{ {
// No DartTestfile.txt? Who cares... // No CTestTestfile? Who cares...
cmSystemTools::ChangeDirectory(cwd.c_str()); cmSystemTools::ChangeDirectory(cwd.c_str());
continue; continue;
} }
@ -1282,11 +1277,6 @@ void cmCTestTestHandler::GetListOfTests()
// does the CTestTestfile.cmake exist ? // does the CTestTestfile.cmake exist ?
testFilename = "CTestTestfile.cmake"; testFilename = "CTestTestfile.cmake";
} }
else if( cmSystemTools::FileExists("DartTestfile.txt") )
{
// does the DartTestfile.txt exist ?
testFilename = "DartTestfile.txt";
}
else else
{ {
return; return;

15
Source/cmLocalGenerator.cxx
View File

@ -174,14 +174,8 @@ void cmLocalGenerator::GenerateTestFiles()
} }
std::string file = this->Makefile->GetStartOutputDirectory(); std::string file = this->Makefile->GetStartOutputDirectory();
file += "/"; file += "/";
if ( this->Makefile->IsSet("CTEST_NEW_FORMAT") ) file += "CTestTestfile.cmake";
{
file += "CTestTestfile.cmake";
}
else
{
file += "DartTestfile.txt";
}
cmGeneratedFileStream fout(file.c_str()); cmGeneratedFileStream fout(file.c_str());
fout.SetCopyIfDifferent(true); fout.SetCopyIfDifferent(true);
@ -196,10 +190,7 @@ void cmLocalGenerator::GenerateTestFiles()
<< "# tree CMakeLists.txt file, skipping any SUBDIRS() or " << "# tree CMakeLists.txt file, skipping any SUBDIRS() or "
<< "ADD_TEST() commands" << std::endl << "ADD_TEST() commands" << std::endl
<< "# that are excluded by CMake control structures, i.e. IF() " << "# that are excluded by CMake control structures, i.e. IF() "
<< "commands." << std::endl << "commands." << std::endl;
<< "#" << std::endl
<< "# The next line is critical for Dart to work" << std::endl
<< "# Duh :-)" << std::endl << std::endl;
const char* testIncludeFile = const char* testIncludeFile =
this->Makefile->GetProperty("TEST_INCLUDE_FILE"); this->Makefile->GetProperty("TEST_INCLUDE_FILE");

5
Source/ctest.cxx
View File

@ -179,7 +179,7 @@ static const char * cmDocumentationOptions[][3] =
{"--ctest-config", "The configuration file used to initialize CTest state " {"--ctest-config", "The configuration file used to initialize CTest state "
"when submitting dashboards.", "when submitting dashboards.",
"This option tells CTest to use different initialization file instead of " "This option tells CTest to use different initialization file instead of "
"DartConfiguration.tcl. This way multiple initialization files can be " "CTestConfiguration.tcl. This way multiple initialization files can be "
"used for example to submit to multiple dashboards." }, "used for example to submit to multiple dashboards." },
{"--overwrite", "Overwrite CTest configuration option.", {"--overwrite", "Overwrite CTest configuration option.",
"By default ctest uses configuration options from configuration file. " "By default ctest uses configuration options from configuration file. "
@ -224,8 +224,7 @@ int main (int argc, char *argv[])
// If there is a testing input file, check for documentation options // If there is a testing input file, check for documentation options
// only if there are actually arguments. We want running without // only if there are actually arguments. We want running without
// arguments to run tests. // arguments to run tests.
if(argc > 1 || !cmSystemTools::FileExists("DartTestfile.txt") && if(argc > 1 || !cmSystemTools::FileExists("CTestTestfile.cmake"))
!cmSystemTools::FileExists("CTestTestfile.cmake"))
{ {
if(argc == 1) if(argc == 1)
{ {