diff options
| author | Kyle Edwards <kyle.edwards@kitware.com> | 2019-11-07 18:10:46 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-11-07 18:10:57 (GMT) |
| commit | bea26f5aa0e1b98dea9d87ba2444c0901842f97c (patch) | |
| tree | a95073df644c93e9b2a887906ed21e900b9857c4 /Help/command | |
| parent | 74569996e8fe798386cca2d4241acea0644f6275 (diff) | |
| parent | 016601e5e6f152403306c12997534aadd4287d38 (diff) | |
| download | CMake-bea26f5aa0e1b98dea9d87ba2444c0901842f97c.zip CMake-bea26f5aa0e1b98dea9d87ba2444c0901842f97c.tar.gz CMake-bea26f5aa0e1b98dea9d87ba2444c0901842f97c.tar.bz2 | |
Merge topic 'ctest-resource-groups'
016601e5e6 Merge branch 'backport-ctest-resource-groups'
c1435d9812 Help: Fix error in resource allocation example
eb9d945f14 CTest: Rename hardware -> resources for RunCMake tests
c544cb6698 CTest: Rename hardware -> resources for source code
6ce27d3a2e cmCTestMultiProcessHandler: Rename resource locking functions
a7c1e15cc4 CTest: Rename hardware -> resources for CMake variables, command options
73a40b19ff CTest: Rename "Processes" lexer to "ResourceGroups"
af9ed543b0 CTest: Rename PROCESSES test property to RESOURCE_GROUPS
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3994
Diffstat (limited to 'Help/command')
| -rw-r--r-- | Help/command/ctest_test.rst | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Help/command/ctest_test.rst b/Help/command/ctest_test.rst index 0a33da3..7a3393b 100644 --- a/Help/command/ctest_test.rst +++ b/Help/command/ctest_test.rst @@ -17,7 +17,7 @@ Perform the :ref:`CTest Test Step` as a :ref:`Dashboard Client`. [EXCLUDE_FIXTURE_SETUP <regex>] [EXCLUDE_FIXTURE_CLEANUP <regex>] [PARALLEL_LEVEL <level>] - [HARDWARE_SPEC_FILE <file>] + [RESOURCE_SPEC_FILE <file>] [TEST_LOAD <threshold>] [SCHEDULE_RANDOM <ON|OFF>] [STOP_TIME <time-of-day>] @@ -83,10 +83,10 @@ The options are: Specify a positive number representing the number of tests to be run in parallel. -``HARDWARE_SPEC_FILE <file>`` +``RESOURCE_SPEC_FILE <file>`` Specify a - :ref:`hardware specification file <ctest-hardware-specification-file>`. See - :ref:`ctest-hardware-allocation` for more information. + :ref:`resource specification file <ctest-resource-specification-file>`. See + :ref:`ctest-resource-allocation` for more information. ``TEST_LOAD <threshold>`` While running tests in parallel, try not to start tests when they |