From 21852384e017b16b04b961b5cbad78a328efd4b0 Mon Sep 17 00:00:00 2001 From: Ken Martin Date: Thu, 31 Jan 2008 11:43:44 -0500 Subject: ENH: read in old file formats Dart as well --- Source/CTest/cmCTestTestHandler.cxx | 15 +++++++++++++++ Source/ctest.cxx | 3 ++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/Source/CTest/cmCTestTestHandler.cxx b/Source/CTest/cmCTestTestHandler.cxx index 660764c..9524454 100644 --- a/Source/CTest/cmCTestTestHandler.cxx +++ b/Source/CTest/cmCTestTestHandler.cxx @@ -100,6 +100,11 @@ bool cmCTestSubdirCommand // does the CTestTestfile.cmake exist ? testFilename = "CTestTestfile.cmake"; } + else if( cmSystemTools::FileExists("DartTestfile.txt") ) + { + // does the DartTestfile.txt exist ? + testFilename = "DartTestfile.txt"; + } else { // No CTestTestfile? Who cares... @@ -186,6 +191,11 @@ bool cmCTestAddSubdirectoryCommand // does the CTestTestfile.cmake exist ? testFilename = "CTestTestfile.cmake"; } + else if( cmSystemTools::FileExists("DartTestfile.txt") ) + { + // does the DartTestfile.txt exist ? + testFilename = "DartTestfile.txt"; + } else { // No CTestTestfile? Who cares... @@ -1378,6 +1388,11 @@ void cmCTestTestHandler::GetListOfTests() // does the CTestTestfile.cmake exist ? testFilename = "CTestTestfile.cmake"; } + if( cmSystemTools::FileExists("DartTestfile.txt") ) + { + // does the DartTestfile.txt exist ? + testFilename = "DartTestfile.txt"; + } else { return; diff --git a/Source/ctest.cxx b/Source/ctest.cxx index b7d132f..ddd22ad 100644 --- a/Source/ctest.cxx +++ b/Source/ctest.cxx @@ -224,7 +224,8 @@ 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("CTestTestfile.cmake")) + if(argc > 1 || !(cmSystemTools::FileExists("CTestTestfile.cmake") || + cmSystemTools::FileExists("DartTestfile.txt"))) { if(argc == 1) { -- cgit v0.12