parent
3ca8c8d946
commit
e9c163762e
|
@ -2040,8 +2040,7 @@ void cmCTest::SetNotesFiles(const char* notes)
|
||||||
}
|
}
|
||||||
|
|
||||||
//----------------------------------------------------------------------
|
//----------------------------------------------------------------------
|
||||||
int cmCTest::ReadCustomConfigurationFileTree(const char* dir, cmMakefile* mf,
|
int cmCTest::ReadCustomConfigurationFileTree(const char* dir, cmMakefile* mf)
|
||||||
bool fast /* = false */)
|
|
||||||
{
|
{
|
||||||
bool found = false;
|
bool found = false;
|
||||||
VectorOfStrings dirs;
|
VectorOfStrings dirs;
|
||||||
|
@ -2074,8 +2073,6 @@ int cmCTest::ReadCustomConfigurationFileTree(const char* dir, cmMakefile* mf,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( !fast )
|
|
||||||
{
|
|
||||||
std::string rexpr = dir;
|
std::string rexpr = dir;
|
||||||
rexpr += "/CTestCustom.ctest";
|
rexpr += "/CTestCustom.ctest";
|
||||||
cmCTestLog(this, DEBUG, "* Check for file: "
|
cmCTestLog(this, DEBUG, "* Check for file: "
|
||||||
|
@ -2102,7 +2099,6 @@ int cmCTest::ReadCustomConfigurationFileTree(const char* dir, cmMakefile* mf,
|
||||||
}
|
}
|
||||||
found = true;
|
found = true;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
if ( found )
|
if ( found )
|
||||||
{
|
{
|
||||||
|
|
|
@ -301,8 +301,7 @@ public:
|
||||||
SetOfStrings* GetSubmitFiles() { return &this->SubmitFiles; }
|
SetOfStrings* GetSubmitFiles() { return &this->SubmitFiles; }
|
||||||
|
|
||||||
//! Read the custom configuration files and apply them to the current ctest
|
//! Read the custom configuration files and apply them to the current ctest
|
||||||
int ReadCustomConfigurationFileTree(const char* dir, cmMakefile* mf,
|
int ReadCustomConfigurationFileTree(const char* dir, cmMakefile* mf);
|
||||||
bool fast = false);
|
|
||||||
|
|
||||||
std::vector<cmStdString> &GetInitialCommandLineArguments()
|
std::vector<cmStdString> &GetInitialCommandLineArguments()
|
||||||
{ return this->InitialCommandLineArguments; };
|
{ return this->InitialCommandLineArguments; };
|
||||||
|
|
Loading…
Reference in New Issue