diff --git a/text9.txt b/text9.txt index d854201..bc618ee 100644 --- a/text9.txt +++ b/text9.txt @@ -1878,3 +1878,55 @@ host_wasm_opfs_browser_smokes=ok 继续小批量 browser test glue guard。优先扫描 direct/browser-interp saved parameter expected line constants 是否能进一步用 shared helper 统一生成;只改测试胶水,不改变输入、OPFS path、WASM path 字符串或保存/读取行为。 + +三十七、2026-06-14 继续执行记录:browser saved parameter expected lines shared helpers + +本轮按上一条下一步建议继续收敛 direct/browser-interp saved parameter expected line +constants,范围仍只触及 `wasm-port/tests/browser/interp_smoke.html` 的 browser test glue。 + +完成内容: + +- 新增 `opfsSavedParameterTextLinesForValues(...)` helper,统一生成 saved parameter text + expected lines; +- 新增 `opfsSavedParameterBackupTextLinesForValues(...)` helper,统一生成 saved parameter + backup expected lines; +- direct saved parameter readback 与 browser-interp OPFS saved parameter readback 均改为复用 + 上述 shared helpers; +- 保持 direct 与 browser-interp saved parameter/readback expected 文本、OPFS path 与 WASM + path 不变; +- 未改变任何 expected 字符串、输入、OPFS path、WASM path 字符串或 save/read/load + 行为; +- 未改变 staging path 模型、OPFS bridge behavior、file-service、SDK planner、 + interpreter、INI、tool、parameter 或 LinuxCNC-owned runtime semantics。 + +验证已通过: + +```bash +git diff --check +wasm-port/tools/verify_vendor_sync.sh +wasm-port/tools/verify_no_standalone_cnc_semantics.sh +SKIP_INTERP_BUILD=1 wasm-port/tests/wasm/node/verify_interp_wasm.sh +SKIP_INTERP_BUILD=1 wasm-port/tests/wasm/node/verify_sim_configs_inventory_wasm.sh +SKIP_INI_BUILD=1 SKIP_INTERP_BUILD=1 wasm-port/tests/browser/verify_interp_browser.sh +wasm-port/tests/host/verify_host_smokes.sh +``` + +关键输出: + +```text +vendor sync up to date +standalone CNC semantics guard complete +interp_wasm_node_smoke=ok +sim_configs_wasm_node_inventory_executed=28 +sim_configs_wasm_node_inventory_passed=28 +sim_configs_wasm_node_inventory_skipped=131 +sim_configs_wasm_node_inventory_unexpected_fail=0 +browser_interp_smoke=ok +host_wasm_opfs_browser_smokes=ok +``` + +下一步建议: + +继续小批量 browser test glue guard。优先扫描 ini-named/explicit session saved parameter +expected line groups 是否也能复用 shared helpers;只改测试胶水,不改变输入、OPFS path、 +WASM path 字符串或保存/读取行为。 diff --git a/wasm-port/tests/browser/interp_smoke.html b/wasm-port/tests/browser/interp_smoke.html index 918494a..46c8eaf 100644 --- a/wasm-port/tests/browser/interp_smoke.html +++ b/wasm-port/tests/browser/interp_smoke.html @@ -4586,6 +4586,20 @@ ); } + function opfsSavedParameterTextLinesForValues(values) { + return [ + ...opfsParameterTextLinesForValues("\t", values), + "absent=<_named_param>", + ]; + } + + function opfsSavedParameterBackupTextLinesForValues(values) { + return [ + ...opfsParameterTextLinesForValues(" ", values), + "<_named_param> 123", + ]; + } + function opfsParameterSeedLines(parameter5161, parameter5162, parameter5221, parameter5399) { return [ `5161 ${parameter5161}`, @@ -9332,23 +9346,15 @@ ), opfsParameterResultLinesForValues("save", browserDirectParameterExpectedValues).join("\n"), ); - const browserDirectSavedParameterTextLines = [ - ...opfsParameterTextLinesForValues("\t", browserDirectParameterReadbackValues), - "absent=<_named_param>", - ]; verifyExpectedOutput( "saved_parameters_direct_text", interp.readTextFile(browserParameterFilePath), - browserDirectSavedParameterTextLines.join("\n"), + opfsSavedParameterTextLinesForValues(browserDirectParameterReadbackValues).join("\n"), ); - const browserDirectSavedParameterBackupTextLines = [ - ...opfsParameterTextLinesForValues(" ", browserDirectInitialParameterValues), - "<_named_param> 123", - ]; verifyExpectedOutput( "saved_parameters_direct_backup", interp.readTextFile(`${browserParameterFilePath}.bak`), - browserDirectSavedParameterBackupTextLines.join("\n"), + opfsSavedParameterBackupTextLinesForValues(browserDirectInitialParameterValues).join("\n"), ); const browserDirectToolTableInputLines = [ @@ -9561,24 +9567,16 @@ savedParameters, opfsParameterResultLinesForValues("save", browserInterpParameterExpectedValues), ); - const browserInterpSavedParameterTextLines = [ - ...opfsParameterTextLinesForValues("\t", browserInterpParameterReadbackValues), - "absent=<_named_param>", - ]; await verifyOpfsMachineFileReadback( "opfs_saved_parameter_text", browserInterpMachineId, "parameters", - browserInterpSavedParameterTextLines, + opfsSavedParameterTextLinesForValues(browserInterpParameterReadbackValues), ); - const browserInterpSavedParameterBackupTextLines = [ - ...opfsParameterTextLinesForValues(" ", browserInterpInitialParameterValues), - "<_named_param> 123", - ]; await verifyOpfsReadback( "opfs_saved_parameter_backup_text", savedParameters.backupOpfsPath, - browserInterpSavedParameterBackupTextLines, + opfsSavedParameterBackupTextLinesForValues(browserInterpInitialParameterValues), ); const savedToolTable = await saveMachineToolTableToOpfs( interp,