diff options
| author | Kyle Edwards <kyle.edwards@kitware.com> | 2020-07-07 14:53:55 (GMT) |
|---|---|---|
| committer | Kyle Edwards <kyle.edwards@kitware.com> | 2020-07-07 16:21:58 (GMT) |
| commit | c57695a2f4ad325346e33eee655b75c1716cf957 (patch) | |
| tree | 2042da6587a8bc5c9f3132b0fad32927597fa528 /Tests/RunCMake/CTestResourceAllocation/RunCMakeTest.cmake | |
| parent | dab33d1e3339c0f06437692db0c3e1db49765ba2 (diff) | |
| download | CMake-c57695a2f4ad325346e33eee655b75c1716cf957.zip CMake-c57695a2f4ad325346e33eee655b75c1716cf957.tar.gz CMake-c57695a2f4ad325346e33eee655b75c1716cf957.tar.bz2 | |
Help: Clarify search order for resource spec file
Clarify the order in which --resource-spec-file, RESOURCE_SPEC_FILE,
and CTEST_RESOURCE_SPEC_FILE are searched, and add tests to
enforce this.
Fixes: #20914
Diffstat (limited to 'Tests/RunCMake/CTestResourceAllocation/RunCMakeTest.cmake')
| -rw-r--r-- | Tests/RunCMake/CTestResourceAllocation/RunCMakeTest.cmake | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Tests/RunCMake/CTestResourceAllocation/RunCMakeTest.cmake b/Tests/RunCMake/CTestResourceAllocation/RunCMakeTest.cmake index e9aa3a4..f5f0699 100644 --- a/Tests/RunCMake/CTestResourceAllocation/RunCMakeTest.cmake +++ b/Tests/RunCMake/CTestResourceAllocation/RunCMakeTest.cmake @@ -153,6 +153,7 @@ function(run_ctest_resource name parallel random extra) if(extra) run_ctest("${name}-ctest-s-res-variable" "-DCTEST_RESOURCE_ALLOC_ENABLED=1" "-DCTEST_RESOURCE_SPEC_SOURCE=VARIABLE" "-DCTRESALLOC_COMMAND=${CTRESALLOC_COMMAND}" "-DCTEST_PARALLEL=${parallel}" "-DCTEST_RANDOM=${random}") run_ctest("${name}-ctest-s-res-cache" "-DCTEST_RESOURCE_ALLOC_ENABLED=1" "-DCTEST_RESOURCE_SPEC_SOURCE=CACHE" "-DCTRESALLOC_COMMAND=${CTRESALLOC_COMMAND}" "-DCTEST_PARALLEL=${parallel}" "-DCTEST_RANDOM=${random}") + run_ctest("${name}-ctest-s-res-cmdline" "-DCTEST_RESOURCE_ALLOC_ENABLED=1" "-DCTEST_RESOURCE_SPEC_SOURCE=CMDLINE" "-DCTRESALLOC_COMMAND=${CTRESALLOC_COMMAND}" "-DCTEST_PARALLEL=${parallel}" "-DCTEST_RANDOM=${random}" --resource-spec-file "${RunCMake_SOURCE_DIR}/resspec.json") endif() endfunction() |