diff options
| author | Brad King <brad.king@kitware.com> | 2019-11-26 14:12:25 +0000 |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-11-26 09:12:33 -0500 |
| commit | b1175431c385cb052769d4575576ebb19b6e594b (patch) | |
| tree | 5a5e9801c4829f97ee53a61d99c865c61399ef3d /Tests/CMakeLib/testCTestResourceSpec_data/spec17.json | |
| parent | 8db38cfe3386c463ef40af8520a5df329f9fd596 (diff) | |
| parent | a033bafbe01fcb4654f075955e0b3de7be81b0f7 (diff) | |
| download | cmake-b1175431c385cb052769d4575576ebb19b6e594b.tar.gz | |
Merge topic 'ctest-resource-fixes' into release-3.16
a033bafbe0 Help: Clarify how tests are run if no resource spec file is specified
a64ba0235f CTest: Clarify that resource requirements can be split
f9f294f5fa CTest: Add version field to resource spec file
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4080
Diffstat (limited to 'Tests/CMakeLib/testCTestResourceSpec_data/spec17.json')
| -rw-r--r-- | Tests/CMakeLib/testCTestResourceSpec_data/spec17.json | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Tests/CMakeLib/testCTestResourceSpec_data/spec17.json b/Tests/CMakeLib/testCTestResourceSpec_data/spec17.json index 1b6ab4b4b1..e4cdfc977d 100644 --- a/Tests/CMakeLib/testCTestResourceSpec_data/spec17.json +++ b/Tests/CMakeLib/testCTestResourceSpec_data/spec17.json @@ -1,4 +1,8 @@ { + "version": { + "major": 1, + "minor": 0 + }, "local": [ { "gpus": [ |