Skip to content

Commit d03b971

Browse files
Hannia Valerahanniavalera
authored andcommitted
update schema URLs to version 11 and enhance job handling for execution
1 parent 40717e6 commit d03b971

2 files changed

Lines changed: 12 additions & 3 deletions

File tree

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4225,11 +4225,11 @@
42254225
},
42264226
{
42274227
"fileMatch": "CMakePresets.json",
4228-
"url": "cmake-tools-schema://schemas/CMakePresets-v10-schema.json"
4228+
"url": "cmake-tools-schema://schemas/CMakePresets-v11-schema.json"
42294229
},
42304230
{
42314231
"fileMatch": "CMakeUserPresets.json",
4232-
"url": "cmake-tools-schema://schemas/CMakePresets-v10-schema.json"
4232+
"url": "cmake-tools-schema://schemas/CMakePresets-v11-schema.json"
42334233
}
42344234
]
42354235
},

src/presets/preset.ts

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2297,7 +2297,16 @@ export function testArgs(preset: TestPreset): string[] {
22972297
if (preset.execution) {
22982298
preset.execution.stopOnFailure && result.push('--stop-on-failure');
22992299
preset.execution.enableFailover && result.push('-F');
2300-
(preset.execution.jobs !== undefined) && result.push('--parallel', preset.execution.jobs.toString());
2300+
if (preset.execution.jobs !== undefined) {
2301+
// v11+: jobs can be an empty string meaning --parallel with no value (auto-detect).
2302+
// The API type says number, but JSON parsing may produce a string at runtime.
2303+
const jobsValue = preset.execution.jobs as number | string;
2304+
if (typeof jobsValue === 'string' && jobsValue.length === 0) {
2305+
result.push('--parallel');
2306+
} else {
2307+
result.push('--parallel', jobsValue.toString());
2308+
}
2309+
}
23012310
preset.execution.resourceSpecFile && result.push('--resource-spec-file', preset.execution.resourceSpecFile);
23022311
preset.execution.testLoad && result.push('--test-load', preset.execution.testLoad.toString());
23032312
preset.execution.showOnly && result.push('--show-only', preset.execution.showOnly);

0 commit comments

Comments
 (0)