From e0d08aecae8769e8f89f2287b1638fd53e4960a1 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 21 Jul 2026 01:05:47 +0200 Subject: [PATCH] fix: send Keil build as structured argv --- tools/hwpod-harness.test.ts | 6 +++--- tools/src/hwpod-harness-lib.ts | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/hwpod-harness.test.ts b/tools/hwpod-harness.test.ts index f8789076..0ec50891 100644 --- a/tools/hwpod-harness.test.ts +++ b/tools/hwpod-harness.test.ts @@ -142,9 +142,9 @@ test("hwpod-compiler-cli generates Keil build and download commands from structu assert.equal(build.exitCode, 0); assert.equal(build.payload.plan.ops[0].op, "debug.build"); assert.equal(build.payload.plan.ops[0].args.target, "USART"); - assert.equal(build.payload.plan.ops[0].args.commandRun.command, "py"); - assert.deepEqual(build.payload.plan.ops[0].args.commandRun.argv.slice(0, 5), ["-3", "C:\\Users\\liang\\.agents\\skills\\keil\\keil-cli.py", "build", "-p", "F:\\Work\\D601-HWLAB\\projects\\01_baseline\\Projects\\MDK-ARM\\atk_f103.uvprojx"]); - assert.deepEqual(build.payload.plan.ops[0].args.commandRun.argv.slice(-2), ["-t", "USART"]); + assert.equal(build.payload.plan.ops[0].args.commandRuns[0].command, "py"); + assert.deepEqual(build.payload.plan.ops[0].args.commandRuns[0].argv.slice(0, 5), ["-3", "C:\\Users\\liang\\.agents\\skills\\keil\\keil-cli.py", "build", "-p", "F:\\Work\\D601-HWLAB\\projects\\01_baseline\\Projects\\MDK-ARM\\atk_f103.uvprojx"]); + assert.deepEqual(build.payload.plan.ops[0].args.commandRuns[0].argv.slice(-2), ["-t", "USART"]); assert.match(build.payload.plan.ops[0].args.command, /^py -3 C:\\Users\\liang\\\.agents\\skills\\keil\\keil-cli\.py build -p/u); assert.match(build.payload.plan.ops[0].args.command, /F:\\Work\\D601-HWLAB\\projects\\01_baseline\\Projects\\MDK-ARM\\atk_f103\.uvprojx/u); assert.match(build.payload.plan.ops[0].args.command, / -t USART$/u); diff --git a/tools/src/hwpod-harness-lib.ts b/tools/src/hwpod-harness-lib.ts index 9f640b76..337408d8 100644 --- a/tools/src/hwpod-harness-lib.ts +++ b/tools/src/hwpod-harness-lib.ts @@ -740,7 +740,7 @@ function debugBuildOps(common: any, args: any, document: any) { reason: text(args.reason) }); if (generated?.commandRun) { - return [{ op: "debug.build", args: clean({ ...opArgs, commandRun: generated.commandRun, command: generated.command }) }]; + return [{ op: "debug.build", args: clean({ ...opArgs, commandRuns: [generated.commandRun], command: generated.command }) }]; } return [{ op: "debug.build", args: clean({ ...opArgs, command: explicitCommand || generated?.command }) }]; }