presets: Name malformed preset collections

2026-09-25 04:09:36 +03:00 · 2026-07-28 00:41:41 +02:00
parent 394ce2ebe6
commit 7ccff59b07
14 changed files with 46 additions and 1 deletions
@@ -82,7 +82,8 @@ void UNRECOGNIZED_VERSION(Json::Value const* value, cmJSONState* state)

 void INVALID_PRESETS(Json::Value const* value, cmJSONState* state)
 {
-  state->AddErrorAtValue("Invalid \"configurePresets\" field", value);
+  state->AddErrorAtValue(cmStrCat("Invalid \"", state->key(), "\" field"),
+                         value);
 }

 void INVALID_PRESET(Json::Value const* value, cmJSONState* state)
@@ -0,0 +1 @@
+1
@@ -0,0 +1,5 @@
+^CMake Error: Could not read presets from [^
+]*/Tests/RunCMake/CMakePresets/InvalidBuildPresets:
+CMakePresets\.json:3: Invalid "buildPresets" field
+  "buildPresets": {}
+                  \^$
@@ -0,0 +1,4 @@
+{
+  "version": 2,
+  "buildPresets": {}
+}
@@ -0,0 +1 @@
+1
@@ -0,0 +1,5 @@
+^CMake Error: Could not read presets from [^
+]*/Tests/RunCMake/CMakePresets/InvalidPackagePresets:
+CMakePresets\.json:3: Invalid "packagePresets" field
+  "packagePresets": {}
+                    \^$
@@ -0,0 +1,4 @@
+{
+  "version": 6,
+  "packagePresets": {}
+}
@@ -0,0 +1 @@
+1
@@ -0,0 +1,5 @@
+^CMake Error: Could not read presets from [^
+]*/Tests/RunCMake/CMakePresets/InvalidTestPresets:
+CMakePresets\.json:3: Invalid "testPresets" field
+  "testPresets": {}
+                 \^$
@@ -0,0 +1,4 @@
+{
+  "version": 2,
+  "testPresets": {}
+}
@@ -0,0 +1 @@
+1
@@ -0,0 +1,5 @@
+^CMake Error: Could not read presets from [^
+]*/Tests/RunCMake/CMakePresets/InvalidWorkflowPresets:
+CMakePresets\.json:3: Invalid "workflowPresets" field
+  "workflowPresets": {}
+                     \^$
@@ -0,0 +1,4 @@
+{
+  "version": 6,
+  "workflowPresets": {}
+}
@@ -152,6 +152,10 @@ set(CMakePresets_SCHEMA_EXPECTED_RESULT 0)
 run_cmake_presets(NoPresets)
 set(CMakePresets_SCHEMA_EXPECTED_RESULT 1)
 run_cmake_presets(InvalidPresets)
+run_cmake_presets(InvalidBuildPresets)
+run_cmake_presets(InvalidTestPresets)
+run_cmake_presets(InvalidPackagePresets)
+run_cmake_presets(InvalidWorkflowPresets)
 run_cmake_presets(PresetNotObject)
 run_cmake_presets(NoPresetName)
 run_cmake_presets(InvalidPresetName)