cmCTest: Remove friend declarations

This commit is contained in:
Regina Pfeifer 2019-03-18 22:25:50 +01:00
parent 9406844616
commit 670d27da64
3 changed files with 13 additions and 6 deletions

View File

@ -132,14 +132,17 @@ bool cmCTestRunTest::EndTest(size_t completed, size_t total, bool started)
} else {
this->TestResult.Status = cmCTestTestHandler::FAILED;
outputStream << "***Failed " << reason;
outputTestErrorsToConsole = this->CTest->OutputTestOutputOnTestFailure;
outputTestErrorsToConsole =
this->CTest->GetOutputTestOutputOnTestFailure();
}
} else if (res == cmProcess::State::Expired) {
outputStream << "***Timeout ";
this->TestResult.Status = cmCTestTestHandler::TIMEOUT;
outputTestErrorsToConsole = this->CTest->OutputTestOutputOnTestFailure;
outputTestErrorsToConsole =
this->CTest->GetOutputTestOutputOnTestFailure();
} else if (res == cmProcess::State::Exception) {
outputTestErrorsToConsole = this->CTest->OutputTestOutputOnTestFailure;
outputTestErrorsToConsole =
this->CTest->GetOutputTestOutputOnTestFailure();
outputStream << "***Exception: ";
this->TestResult.ExceptionStatus =
this->TestProcess->GetExitExceptionString();

View File

@ -2825,6 +2825,11 @@ bool cmCTest::GetSubprojectSummary() const
return this->SubprojectSummary;
}
bool cmCTest::GetOutputTestOutputOnTestFailure() const
{
return this->OutputTestOutputOnTestFailure;
}
const std::map<std::string, std::string>& cmCTest::GetDefinitions() const
{
return this->Definitions;

View File

@ -31,9 +31,6 @@ class cmXMLWriter;
*/
class cmCTest
{
friend class cmCTestRunTest;
friend class cmCTestMultiProcessHandler;
public:
typedef cmProcessOutput::Encoding Encoding;
/** Enumerate parts of the testing and submission process. */
@ -455,6 +452,8 @@ public:
std::string GetCostDataFile();
bool GetOutputTestOutputOnTestFailure() const;
const std::map<std::string, std::string>& GetDefinitions() const;
/** Return the number of times a test should be run */