Commit 0dd2b6eb authored by Andy Cedilnik's avatar Andy Cedilnik
Browse files

BUG: By default disable new files.

parent f9545f3f
...@@ -302,9 +302,16 @@ IF(BUILD_TESTING) ...@@ -302,9 +302,16 @@ IF(BUILD_TESTING)
# Use CTest # Use CTest
# configure files # configure files
CONFIGURE_FILE(
${CMAKE_ROOT}/Modules/DartConfiguration.tcl.in IF(CTEST_NEW_FORMAT)
${PROJECT_BINARY_DIR}/CTestConfiguration.ini ) CONFIGURE_FILE(
${CMAKE_ROOT}/Modules/DartConfiguration.tcl.in
${PROJECT_BINARY_DIR}/CTestConfiguration.ini )
ELSE(CTEST_NEW_FORMAT)
CONFIGURE_FILE(
${CMAKE_ROOT}/Modules/DartConfiguration.tcl.in
${PROJECT_BINARY_DIR}/DartConfiguration.tcl )
ENDIF(CTEST_NEW_FORMAT)
# #
# Section 3: # Section 3:
......
...@@ -44,13 +44,13 @@ void cmAddTestCommand::FinalPass() ...@@ -44,13 +44,13 @@ void cmAddTestCommand::FinalPass()
std::string fname; std::string fname;
fname = m_Makefile->GetStartOutputDirectory(); fname = m_Makefile->GetStartOutputDirectory();
fname += "/"; fname += "/";
if ( m_Makefile->IsSet("DART_ROOT") ) if ( m_Makefile->IsSet("CTEST_NEW_FORMAT") )
{ {
fname += "DartTestfile.txt"; fname += "CTestTestfile.cmake";
} }
else else
{ {
fname += "CTestTestfile.cmake"; fname += "DartTestfile.txt";
} }
......
...@@ -37,13 +37,13 @@ void cmEnableTestingCommand::CreateDartTestfileForMakefile(cmMakefile *mf) ...@@ -37,13 +37,13 @@ void cmEnableTestingCommand::CreateDartTestfileForMakefile(cmMakefile *mf)
std::string fname; std::string fname;
fname = mf->GetStartOutputDirectory(); fname = mf->GetStartOutputDirectory();
fname += "/"; fname += "/";
if ( m_Makefile->IsSet("DART_ROOT") ) if ( m_Makefile->IsSet("CTEST_NEW_FORMAT") )
{ {
fname += "DartTestfile.txt"; fname += "CTestTestfile.cmake";
} }
else else
{ {
fname += "CTestTestfile.cmake"; fname += "DartTestfile.txt";
} }
cmSystemTools::MakeDirectory(mf->GetStartOutputDirectory()); cmSystemTools::MakeDirectory(mf->GetStartOutputDirectory());
......
...@@ -1032,13 +1032,13 @@ void cmGlobalGenerator::SetupTests() ...@@ -1032,13 +1032,13 @@ void cmGlobalGenerator::SetupTests()
std::string fname; std::string fname;
fname = m_CMakeInstance->GetStartOutputDirectory(); fname = m_CMakeInstance->GetStartOutputDirectory();
fname += "/"; fname += "/";
if ( m_LocalGenerators[0]->GetMakefile()->IsSet("DART_ROOT") ) if ( m_LocalGenerators[0]->GetMakefile()->IsSet("CTEST_NEW_FORMAT") )
{ {
fname += "DartTestfile.txt"; fname += "CTestTestfile.txt";
} }
else else
{ {
fname += "CTestTestfile.txt"; fname += "DartTestfile.txt";
} }
// If the file doesn't exist, then ENABLE_TESTING hasn't been run // If the file doesn't exist, then ENABLE_TESTING hasn't been run
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment