[cmake-commits] martink committed cmLocalGenerator.cxx 1.252 1.253 ctest.cxx 1.100 1.101

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv19422

Modified Files:
	cmLocalGenerator.cxx ctest.cxx 
Log Message:
ENH: use CTestTestfile.txt


Index: cmLocalGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalGenerator.cxx,v
retrieving revision 1.252
retrieving revision 1.253
diff -u -d -r1.252 -r1.253
--- cmLocalGenerator.cxx	17 Jan 2008 15:00:19 -0000	1.252
+++ cmLocalGenerator.cxx	17 Jan 2008 17:44:59 -0000	1.253
@@ -174,14 +174,8 @@
     }
   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 @@
        << "# 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");

Index: ctest.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/ctest.cxx,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -d -r1.100 -r1.101
--- ctest.cxx	13 Dec 2007 22:56:49 -0000	1.100
+++ ctest.cxx	17 Jan 2008 17:44:59 -0000	1.101
@@ -179,7 +179,7 @@
   {"--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 @@
   // 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)
       {