ENH: use CTestTestfile.txt

3 files changed, 6 insertions, 26 deletions

diff --git a/Source/CTest/cmCTestTestHandler.cxx b/Source/CTest/cmCTestTestHandler.cxx
index e2d96e3..44bb98d 100644
--- a/Source/CTest/cmCTestTestHandler.cxx
+++ b/Source/CTest/cmCTestTestHandler.cxx
@@ -98,14 +98,9 @@ bool cmCTestSubdirCommand::InitialPass(std::vector<std::string> const& args)
       // does the CTestTestfile.cmake exist ?
       testFilename = "CTestTestfile.cmake";
       }
-    else if( cmSystemTools::FileExists("DartTestfile.txt") )
-      {
-      // does the DartTestfile.txt exist ?
-      testFilename = "DartTestfile.txt";
-      }
     else
       {
-      // No DartTestfile.txt? Who cares...
+      // No CTestTestfile? Who cares...
       cmSystemTools::ChangeDirectory(cwd.c_str());
       continue;
       }
@@ -1282,11 +1277,6 @@ void cmCTestTestHandler::GetListOfTests()
     // does the CTestTestfile.cmake exist ?
     testFilename = "CTestTestfile.cmake";
     }
-  else if( cmSystemTools::FileExists("DartTestfile.txt") )
-    {
-    // does the DartTestfile.txt exist ?
-    testFilename = "DartTestfile.txt";
-    }
   else
     {
     return;
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index c788842..3ac703d 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -174,14 +174,8 @@ void cmLocalGenerator::GenerateTestFiles()
     }
   std::string file = this->Makefile->GetStartOutputDirectory();
   file += "/";
-  if ( this->Makefile->IsSet("CTEST_NEW_FORMAT") )
-    {
-    file += "CTestTestfile.cmake";
-    }
-  else
-    {
-    file += "DartTestfile.txt";
-    }
+  file += "CTestTestfile.cmake";
+
   cmGeneratedFileStream fout(file.c_str());
   fout.SetCopyIfDifferent(true);
 
@@ -196,10 +190,7 @@ void cmLocalGenerator::GenerateTestFiles()
        << "# tree CMakeLists.txt file, skipping any SUBDIRS() or "
        << "ADD_TEST() commands" << std::endl
        << "# that are excluded by CMake control structures, i.e. IF() "
-       << "commands." << std::endl
-       << "#" << std::endl
-       << "# The next line is critical for Dart to work" << std::endl
-       << "# Duh :-)" << std::endl << std::endl;
+       << "commands." << std::endl;
   
   const char* testIncludeFile = 
     this->Makefile->GetProperty("TEST_INCLUDE_FILE");
diff --git a/Source/ctest.cxx b/Source/ctest.cxx
index 11e8dd2..b7d132f 100644
--- a/Source/ctest.cxx
+++ b/Source/ctest.cxx
@@ -179,7 +179,7 @@ static const char * cmDocumentationOptions[][3] =
   {"--ctest-config", "The configuration file used to initialize CTest state "
   "when submitting dashboards.",
    "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." },
   {"--overwrite", "Overwrite CTest configuration option.",
    "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
   // only if there are actually arguments.  We want running without
   // arguments to run tests.
-  if(argc > 1 || !cmSystemTools::FileExists("DartTestfile.txt") &&
-    !cmSystemTools::FileExists("CTestTestfile.cmake"))
+  if(argc > 1 || !cmSystemTools::FileExists("CTestTestfile.cmake"))
     {
     if(argc == 1)
       {