mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-07 06:09:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

cmCTestRunTest: Remove unnecessary arguments to ForkProcess

Browse Source
This commit is contained in:
Brad King
2023-05-04 15:21:02 -04:00
parent 07b5087ba7
commit 59336b29bd
2 changed files with 10 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Source/CTest/cmCTestRunTest.cxx
View File

@@ -636,10 +636,7 @@ bool cmCTestRunTest::StartTest(size_t completed, size_t total)
} }
} }
return this->ForkProcess(timeout, this->TestProperties->ExplicitTimeout, return this->ForkProcess(timeout);
&this->TestProperties->Environment,
&this->TestProperties->EnvironmentModification,
&this->TestProperties->Affinity);
} }
void cmCTestRunTest::ComputeArguments() void cmCTestRunTest::ComputeArguments()
@@ -737,11 +734,7 @@ void cmCTestRunTest::ParseOutputForMeasurements()
} }
} }
bool cmCTestRunTest::ForkProcess( bool cmCTestRunTest::ForkProcess(cmDuration testTimeOut)
cmDuration testTimeOut, bool explicitTimeout,
std::vector<std::string>* environment,
std::vector<std::string>* environment_modification,
std::vector<size_t>* affinity)
{ {
this->TestProcess->SetId(this->Index); this->TestProcess->SetId(this->Index);
this->TestProcess->SetWorkingDirectory(this->TestProperties->Directory); this->TestProcess->SetWorkingDirectory(this->TestProperties->Directory);
@@ -766,7 +759,8 @@ bool cmCTestRunTest::ForkProcess(
timeout = std::chrono::seconds(1); timeout = std::chrono::seconds(1);
} }
// handle timeout explicitly set to 0 // handle timeout explicitly set to 0
if (testTimeOut == cmDuration::zero() && explicitTimeout) { if (testTimeOut == cmDuration::zero() &&
this->TestProperties->ExplicitTimeout) {
timeout = cmDuration::zero(); timeout = cmDuration::zero();
} }
cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT, cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
@@ -784,17 +778,17 @@ bool cmCTestRunTest::ForkProcess(
// We split processing ENVIRONMENT and ENVIRONMENT_MODIFICATION into two // We split processing ENVIRONMENT and ENVIRONMENT_MODIFICATION into two
// phases to ensure that MYVAR=reset: in the latter phase resets to the // phases to ensure that MYVAR=reset: in the latter phase resets to the
// former phase's settings, rather than to the original environment. // former phase's settings, rather than to the original environment.
if (environment && !environment->empty()) { if (!this->TestProperties->Environment.empty()) {
cmSystemTools::EnvDiff diff; cmSystemTools::EnvDiff diff;
diff.AppendEnv(*environment); diff.AppendEnv(this->TestProperties->Environment);
diff.ApplyToCurrentEnv(&envMeasurement); diff.ApplyToCurrentEnv(&envMeasurement);
} }
if (environment_modification && !environment_modification->empty()) { if (!this->TestProperties->EnvironmentModification.empty()) {
cmSystemTools::EnvDiff diff; cmSystemTools::EnvDiff diff;
bool env_ok = true; bool env_ok = true;
for (auto const& envmod : *environment_modification) { for (auto const& envmod : this->TestProperties->EnvironmentModification) {
env_ok &= diff.ParseOperation(envmod); env_ok &= diff.ParseOperation(envmod);
} }
@@ -823,7 +817,7 @@ bool cmCTestRunTest::ForkProcess(
1); 1);
return this->TestProcess->StartProcess(this->MultiTestHandler.Loop, return this->TestProcess->StartProcess(this->MultiTestHandler.Loop,
affinity); &this->TestProperties->Affinity);
} }
void cmCTestRunTest::SetupResourcesEnvironment(std::vector<std::string>* log) void cmCTestRunTest::SetupResourcesEnvironment(std::vector<std::string>* log)

5
Source/CTest/cmCTestRunTest.h
View File

@@ -110,10 +110,7 @@ private:
bool NeedsToRepeat(); bool NeedsToRepeat();
void ParseOutputForMeasurements(); void ParseOutputForMeasurements();
void ExeNotFound(std::string exe); void ExeNotFound(std::string exe);
bool ForkProcess(cmDuration testTimeOut, bool explicitTimeout, bool ForkProcess(cmDuration testTimeOut);
std::vector<std::string>* environment,
std::vector<std::string>* environment_modification,
std::vector<size_t>* affinity);
void WriteLogOutputTop(size_t completed, size_t total); void WriteLogOutputTop(size_t completed, size_t total);
// Run post processing of the process output for MemCheck // Run post processing of the process output for MemCheck
void MemCheckPostProcess(); void MemCheckPostProcess();