BUG: The fast mode should not read CTestCustom.ctest files
This commit is contained in:
parent
be2c468bfe
commit
47d9021b66
|
@ -1922,8 +1922,6 @@ int cmCTest::ReadCustomConfigurationFileTree(const char* dir, cmMakefile* mf,
|
|||
cmCTestLog(this, DEBUG, "* Read custom CTest configuration directory: "
|
||||
<< dir << std::endl);
|
||||
|
||||
if ( !fast )
|
||||
{
|
||||
std::string fname = dir;
|
||||
fname += "/CTestCustom.cmake";
|
||||
cmCTestLog(this, DEBUG, "* Check for file: "
|
||||
|
@ -1941,8 +1939,9 @@ int cmCTest::ReadCustomConfigurationFileTree(const char* dir, cmMakefile* mf,
|
|||
}
|
||||
found = true;
|
||||
}
|
||||
}
|
||||
|
||||
if ( !fast )
|
||||
{
|
||||
std::string rexpr = dir;
|
||||
rexpr += "/CTestCustom.ctest";
|
||||
cmCTestLog(this, DEBUG, "* Check for file: "
|
||||
|
@ -1969,6 +1968,7 @@ int cmCTest::ReadCustomConfigurationFileTree(const char* dir, cmMakefile* mf,
|
|||
}
|
||||
found = true;
|
||||
}
|
||||
}
|
||||
|
||||
if ( found )
|
||||
{
|
||||
|
|
Loading…
Reference in New Issue