diff options
| author | Craig Scott <craig.scott@crascit.com> | 2019-11-05 05:20:35 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2019-11-05 17:08:35 (GMT) |
| commit | a7c1e15cc46aa97cc19c9eb84fe8cad55c650bfa (patch) | |
| tree | ce3e7853796cf091940b519e13b03fc6643d70ee /Tests | |
| parent | 73a40b19ffa49bfc92fbe10bd0fd3821b7facae6 (diff) | |
| download | CMake-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 'Tests')
4 files changed, 5 insertions, 5 deletions
diff --git a/Tests/RunCMake/CTestHardwareAllocation/cthwalloc.cxx b/Tests/RunCMake/CTestHardwareAllocation/cthwalloc.cxx index e5f0283..1a61e6f 100644 --- a/Tests/RunCMake/CTestHardwareAllocation/cthwalloc.cxx +++ b/Tests/RunCMake/CTestHardwareAllocation/cthwalloc.cxx @@ -54,7 +54,7 @@ static int usageWrite(const char* argv0) static int usageVerify(const char* argv0) { std::cout << "Usage: " << argv0 - << " verify <log-file> <hardware-spec-file> [<test-names>]" + << " verify <log-file> <resource-spec-file> [<test-names>]" << std::endl; return 1; } @@ -286,7 +286,7 @@ static int doVerify(int argc, char const* const* argv) cmCTestHardwareSpec spec; if (!spec.ReadFromJSONFile(hwFile)) { - std::cout << "Could not read hardware spec " << hwFile << std::endl; + std::cout << "Could not read resource spec " << hwFile << std::endl; return 1; } diff --git a/Tests/RunCMake/CTestHardwareAllocation/notenough1-ctest-s-hw-stderr.txt b/Tests/RunCMake/CTestHardwareAllocation/notenough1-ctest-s-hw-stderr.txt index d465cd3..f1ea087 100644 --- a/Tests/RunCMake/CTestHardwareAllocation/notenough1-ctest-s-hw-stderr.txt +++ b/Tests/RunCMake/CTestHardwareAllocation/notenough1-ctest-s-hw-stderr.txt @@ -1,4 +1,4 @@ -^Insufficient hardware +^Insufficient resources CMake Error at [^ ]*/Tests/RunCMake/CTestHardwareAllocation/notenough1-ctest-s-hw/test\.cmake:[0-9]+ \(message\): Tests did not pass$ diff --git a/Tests/RunCMake/CTestHardwareAllocation/notenough2-ctest-s-hw-stderr.txt b/Tests/RunCMake/CTestHardwareAllocation/notenough2-ctest-s-hw-stderr.txt index 912f0fb..bc03156 100644 --- a/Tests/RunCMake/CTestHardwareAllocation/notenough2-ctest-s-hw-stderr.txt +++ b/Tests/RunCMake/CTestHardwareAllocation/notenough2-ctest-s-hw-stderr.txt @@ -1,4 +1,4 @@ -^Insufficient hardware +^Insufficient resources CMake Error at [^ ]*/Tests/RunCMake/CTestHardwareAllocation/notenough2-ctest-s-hw/test\.cmake:[0-9]+ \(message\): Tests did not pass$ diff --git a/Tests/RunCMake/CTestHardwareAllocation/test.cmake.in b/Tests/RunCMake/CTestHardwareAllocation/test.cmake.in index 5ba3587..a4884dc 100644 --- a/Tests/RunCMake/CTestHardwareAllocation/test.cmake.in +++ b/Tests/RunCMake/CTestHardwareAllocation/test.cmake.in @@ -15,7 +15,7 @@ ctest_configure(OPTIONS ctest_build() if(CTEST_HARDWARE_ALLOC_ENABLED) - set(hwspec HARDWARE_SPEC_FILE "@RunCMake_SOURCE_DIR@/hwspec.json") + set(hwspec RESOURCE_SPEC_FILE "@RunCMake_SOURCE_DIR@/hwspec.json") endif() ctest_test(${hwspec} RETURN_VALUE retval PARALLEL_LEVEL ${CTEST_PARALLEL} SCHEDULE_RANDOM ${CTEST_RANDOM}) if(retval) |