mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-22 22:31:18 -05:00
Code Issues Packages Projects Releases Wiki Activity

Refactor: Require detail when calling cmCTestRunTest::StartFailure()

Browse Source
This commit is contained in:
Kyle Edwards
2020-02-21 16:53:48 -05:00
parent 8d6ea4401c
commit 1dec359422
3 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/CTest/cmCTestMultiProcessHandler.cxx
+4 -3
View File
@@ -197,7 +197,7 @@ bool cmCTestMultiProcessHandler::StartTestProcess(int test)
this->LockResources(test);
if (!this->TestsHaveSufficientResources[test]) {
testRun->StartFailure("Insufficient resources");
testRun->StartFailure("Insufficient resources", "Failed to start");
this->FinishTestProcess(testRun, false);
return false;
}
@@ -205,8 +205,9 @@ bool cmCTestMultiProcessHandler::StartTestProcess(int test)
cmWorkingDirectory workdir(this->Properties[test]->Directory);
if (workdir.Failed()) {
testRun->StartFailure("Failed to change working directory to " +
this->Properties[test]->Directory + " : " +
std::strerror(workdir.GetLastResult()));
this->Properties[test]->Directory + " : " +
std::strerror(workdir.GetLastResult()),
"Failed to start");
} else {
if (testRun->StartTest(this->Completed, this->Total)) {
// Ownership of 'testRun' has moved to another structure.
Source/CTest/cmCTestRunTest.cxx
+6 -4
View File
@@ -324,8 +324,9 @@ bool cmCTestRunTest::StartAgain(size_t completed)
cmWorkingDirectory workdir(this->TestProperties->Directory);
if (workdir.Failed()) {
this->StartFailure("Failed to change working directory to " +
this->TestProperties->Directory + " : " +
std::strerror(workdir.GetLastResult()));
this->TestProperties->Directory + " : " +
std::strerror(workdir.GetLastResult()),
"Failed to start");
return true;
}
@@ -381,7 +382,8 @@ void cmCTestRunTest::MemCheckPostProcess()
handler->PostProcessTest(this->TestResult, this->Index);
}
void cmCTestRunTest::StartFailure(std::string const& output)
void cmCTestRunTest::StartFailure(std::string const& output,
std::string const& detail)
{
// Still need to log the Start message so the test summary records our
// attempt to start this test
@@ -404,7 +406,7 @@ void cmCTestRunTest::StartFailure(std::string const& output)
this->TestResult.ExecutionTime = cmDuration::zero();
this->TestResult.CompressOutput = false;
this->TestResult.ReturnValue = -1;
this->TestResult.CompletionStatus = "Failed to start";
this->TestResult.CompletionStatus = detail;
this->TestResult.Status = cmCTestTestHandler::NOT_RUN;
this->TestResult.TestCount = this->TestProperties->Index;
this->TestResult.Name = this->TestProperties->Name;
Source/CTest/cmCTestRunTest.h
+1 -1
View File
@@ -76,7 +76,7 @@ public:
bool StartAgain(size_t completed);
void StartFailure(std::string const& output);
void StartFailure(std::string const& output, std::string const& detail);
cmCTest* GetCTest() const { return this->CTest; }