summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyle Edwards <kyle.edwards@kitware.com>2019-11-28 03:48:08 +0000
committerKitware Robot <kwrobot@kitware.com>2019-11-27 22:48:19 -0500
commit85fb95562bb7f04664f0b47d20f248c9779ff61f (patch)
tree88a26256f7e7c400dbcad61a7485821869accf9d
parent1b4482f65dd41f21ec8abc0777b8dc1f0381bbd6 (diff)
parent59df85194e47ea330478410092ddb9c6fcb17163 (diff)
downloadcmake-85fb95562bb7f04664f0b47d20f248c9779ff61f.tar.gz
Merge topic 'ctest-spec-file-version-test' into release-3.16
59df85194e CTest Resource Allocation: Add test for spec file with no version Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4092
-rw-r--r--Tests/CMakeLib/testCTestResourceSpec.cxx1
-rw-r--r--Tests/CMakeLib/testCTestResourceSpec_data/spec36.json4
2 files changed, 5 insertions, 0 deletions
diff --git a/Tests/CMakeLib/testCTestResourceSpec.cxx b/Tests/CMakeLib/testCTestResourceSpec.cxx
index b981387567..b69003d5a0 100644
--- a/Tests/CMakeLib/testCTestResourceSpec.cxx
+++ b/Tests/CMakeLib/testCTestResourceSpec.cxx
@@ -56,6 +56,7 @@ static const std::vector<ExpectedSpec> expectedResourceSpecs = {
{"spec33.json", false, {{{}}}},
{"spec34.json", false, {{{}}}},
{"spec35.json", false, {{{}}}},
+ {"spec36.json", false, {{{}}}},
{"noexist.json", false, {{{}}}},
/* clang-format on */
};
diff --git a/Tests/CMakeLib/testCTestResourceSpec_data/spec36.json b/Tests/CMakeLib/testCTestResourceSpec_data/spec36.json
new file mode 100644
index 0000000000..6175b1a99d
--- /dev/null
+++ b/Tests/CMakeLib/testCTestResourceSpec_data/spec36.json
@@ -0,0 +1,4 @@
+{
+ "local": [
+ ]
+}