summaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
authorCraig Scott <craig.scott@crascit.com>2019-11-05 05:20:35 (GMT)
committerBrad King <brad.king@kitware.com>2019-11-05 17:08:35 (GMT)
commita7c1e15cc46aa97cc19c9eb84fe8cad55c650bfa (patch)
treece3e7853796cf091940b519e13b03fc6643d70ee /Source
parent73a40b19ffa49bfc92fbe10bd0fd3821b7facae6 (diff)
downloadCMake-a7c1e15cc46aa97cc19c9eb84fe8cad55c650bfa.zip
CMake-a7c1e15cc46aa97cc19c9eb84fe8cad55c650bfa.tar.gz
CMake-a7c1e15cc46aa97cc19c9eb84fe8cad55c650bfa.tar.bz2
CTest: Rename hardware -> resources for CMake variables, command options
Only changes the user-visible effects of renaming hardware allocation to resource allocation. Code changes are the minimum needed to achieve that.
Diffstat (limited to 'Source')
-rw-r--r--Source/CTest/cmCTestMultiProcessHandler.cxx2
-rw-r--r--Source/CTest/cmCTestTestCommand.cxx4
-rw-r--r--Source/CTest/cmCTestTestHandler.cxx4
-rw-r--r--Source/cmCTest.cxx6
-rw-r--r--Source/ctest.cxx2
5 files changed, 9 insertions, 9 deletions
diff --git a/Source/CTest/cmCTestMultiProcessHandler.cxx b/Source/CTest/cmCTestMultiProcessHandler.cxx
index c71ae7b..5248d2c 100644
--- a/Source/CTest/cmCTestMultiProcessHandler.cxx
+++ b/Source/CTest/cmCTestMultiProcessHandler.cxx
@@ -195,7 +195,7 @@ bool cmCTestMultiProcessHandler::StartTestProcess(int test)
this->AllocateResources(test);
if (!this->TestsHaveSufficientHardware[test]) {
- testRun->StartFailure("Insufficient hardware");
+ testRun->StartFailure("Insufficient resources");
this->FinishTestProcess(testRun, false);
return false;
}
diff --git a/Source/CTest/cmCTestTestCommand.cxx b/Source/CTest/cmCTestTestCommand.cxx
index 5496353..f17ed86 100644
--- a/Source/CTest/cmCTestTestCommand.cxx
+++ b/Source/CTest/cmCTestTestCommand.cxx
@@ -32,7 +32,7 @@ void cmCTestTestCommand::BindArguments()
this->Bind("SCHEDULE_RANDOM"_s, this->ScheduleRandom);
this->Bind("STOP_TIME"_s, this->StopTime);
this->Bind("TEST_LOAD"_s, this->TestLoad);
- this->Bind("HARDWARE_SPEC_FILE"_s, this->HardwareSpecFile);
+ this->Bind("RESOURCE_SPEC_FILE"_s, this->HardwareSpecFile);
}
cmCTestGenericHandler* cmCTestTestCommand::InitializeHandler()
@@ -89,7 +89,7 @@ cmCTestGenericHandler* cmCTestTestCommand::InitializeHandler()
handler->SetOption("ScheduleRandom", this->ScheduleRandom.c_str());
}
if (!this->HardwareSpecFile.empty()) {
- handler->SetOption("HardwareSpecFile", this->HardwareSpecFile.c_str());
+ handler->SetOption("ResourceSpecFile", this->HardwareSpecFile.c_str());
}
if (!this->StopTime.empty()) {
this->CTest->SetStopTime(this->StopTime);
diff --git a/Source/CTest/cmCTestTestHandler.cxx b/Source/CTest/cmCTestTestHandler.cxx
index ec5c4bc..2220074 100644
--- a/Source/CTest/cmCTestTestHandler.cxx
+++ b/Source/CTest/cmCTestTestHandler.cxx
@@ -510,12 +510,12 @@ bool cmCTestTestHandler::ProcessOptions()
}
this->SetRerunFailed(cmIsOn(this->GetOption("RerunFailed")));
- val = this->GetOption("HardwareSpecFile");
+ val = this->GetOption("ResourceSpecFile");
if (val) {
this->UseHardwareSpec = true;
if (!this->HardwareSpec.ReadFromJSONFile(val)) {
cmCTestLog(this->CTest, ERROR_MESSAGE,
- "Could not read hardware spec file: " << val << std::endl);
+ "Could not read resource spec file: " << val << std::endl);
return false;
}
}
diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx
index 10b7646..6eae26e 100644
--- a/Source/cmCTest.cxx
+++ b/Source/cmCTest.cxx
@@ -2090,12 +2090,12 @@ bool cmCTest::HandleCommandLineArguments(size_t& i,
"ExcludeFixtureCleanupRegularExpression", args[i].c_str());
}
- if (this->CheckArgument(arg, "--hardware-spec-file") &&
+ if (this->CheckArgument(arg, "--resource-spec-file") &&
i < args.size() - 1) {
i++;
- this->GetTestHandler()->SetPersistentOption("HardwareSpecFile",
+ this->GetTestHandler()->SetPersistentOption("ResourceSpecFile",
args[i].c_str());
- this->GetMemCheckHandler()->SetPersistentOption("HardwareSpecFile",
+ this->GetMemCheckHandler()->SetPersistentOption("ResourceSpecFile",
args[i].c_str());
}
diff --git a/Source/ctest.cxx b/Source/ctest.cxx
index 91ee598..0d65902 100644
--- a/Source/ctest.cxx
+++ b/Source/ctest.cxx
@@ -103,7 +103,7 @@ static const char* cmDocumentationOptions[][2] = {
"times without failing in order to pass" },
{ "--max-width <width>", "Set the max width for a test name to output" },
{ "--interactive-debug-mode [0|1]", "Set the interactive mode to 0 or 1." },
- { "--hardware-spec-file <file>", "Set the hardware spec file to use." },
+ { "--resource-spec-file <file>", "Set the resource spec file to use." },
{ "--no-label-summary", "Disable timing summary information for labels." },
{ "--no-subproject-summary",
"Disable timing summary information for "