BUG: By default disable new files.
This commit is contained in:
parent
f9545f3fef
commit
0dd2b6eb80
|
@ -302,9 +302,16 @@ IF(BUILD_TESTING)
|
|||
|
||||
# Use CTest
|
||||
# configure files
|
||||
CONFIGURE_FILE(
|
||||
${CMAKE_ROOT}/Modules/DartConfiguration.tcl.in
|
||||
${PROJECT_BINARY_DIR}/CTestConfiguration.ini )
|
||||
|
||||
IF(CTEST_NEW_FORMAT)
|
||||
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:
|
||||
|
|
|
@ -44,13 +44,13 @@ void cmAddTestCommand::FinalPass()
|
|||
std::string fname;
|
||||
fname = m_Makefile->GetStartOutputDirectory();
|
||||
fname += "/";
|
||||
if ( m_Makefile->IsSet("DART_ROOT") )
|
||||
if ( m_Makefile->IsSet("CTEST_NEW_FORMAT") )
|
||||
{
|
||||
fname += "DartTestfile.txt";
|
||||
fname += "CTestTestfile.cmake";
|
||||
}
|
||||
else
|
||||
{
|
||||
fname += "CTestTestfile.cmake";
|
||||
fname += "DartTestfile.txt";
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -37,13 +37,13 @@ void cmEnableTestingCommand::CreateDartTestfileForMakefile(cmMakefile *mf)
|
|||
std::string fname;
|
||||
fname = mf->GetStartOutputDirectory();
|
||||
fname += "/";
|
||||
if ( m_Makefile->IsSet("DART_ROOT") )
|
||||
if ( m_Makefile->IsSet("CTEST_NEW_FORMAT") )
|
||||
{
|
||||
fname += "DartTestfile.txt";
|
||||
fname += "CTestTestfile.cmake";
|
||||
}
|
||||
else
|
||||
{
|
||||
fname += "CTestTestfile.cmake";
|
||||
fname += "DartTestfile.txt";
|
||||
}
|
||||
|
||||
cmSystemTools::MakeDirectory(mf->GetStartOutputDirectory());
|
||||
|
|
|
@ -1032,13 +1032,13 @@ void cmGlobalGenerator::SetupTests()
|
|||
std::string fname;
|
||||
fname = m_CMakeInstance->GetStartOutputDirectory();
|
||||
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
|
||||
{
|
||||
fname += "CTestTestfile.txt";
|
||||
fname += "DartTestfile.txt";
|
||||
}
|
||||
|
||||
// If the file doesn't exist, then ENABLE_TESTING hasn't been run
|
||||
|
|
Loading…
Reference in New Issue