diff --git a/text9.txt b/text9.txt index 49825fc..23d5c45 100644 --- a/text9.txt +++ b/text9.txt @@ -2249,3 +2249,67 @@ host_wasm_opfs_browser_smokes=ok 继续小批量 browser test glue guard。优先扫描 browser-interp/direct 参数 load/save/result/backing text groups 是否还能进一步局部常量化或复用 existing helpers; 只改测试胶水,不改变输入、OPFS path、WASM path 字符串或保存/读取行为。 + +四十四、2026-06-14 继续执行记录:browser direct/interp parameter result groups guard + +本轮按上一条下一步建议继续收敛 browser-interp/direct 参数 restore/save/result/backing +text groups,范围仍只触及 `wasm-port/tests/browser/interp_smoke.html` 的 +browser/OPFS test glue。 + +完成内容: + +- 新增 `browserDirectRestoreParameterResultLines` 局部常量,承载 direct parameter restore + expected result lines; +- 新增 `browserDirectSaveParameterResultLines` 局部常量,承载 direct parameter save + expected result lines; +- 新增 `browserDirectSavedParameterTextLines` 局部常量,承载 direct parameter saved text + expected lines; +- 新增 `browserDirectSavedParameterBackupTextLines` 局部常量,承载 direct parameter + backup text expected lines; +- 新增 `browserInterpRestoreParameterResultLines` 局部常量,承载 browser-interp + parameter restore expected result lines; +- 新增 `browserInterpSaveParameterResultLines` 局部常量,承载 browser-interp parameter + save expected result lines; +- 新增 `browserInterpSavedParameterTextLines` 局部常量,承载 browser-interp saved text + expected lines; +- 新增 `browserInterpSavedParameterBackupTextLines` 局部常量,承载 browser-interp + backup text expected lines; +- direct 与 browser-interp 参数 restore/save/readback/backup 断言改为复用上述 line + groups; +- 保持 direct/browser-interp session 的 expected 文本、OPFS path 与 WASM path 不变; +- 未改变任何 expected 字符串、输入、OPFS path、WASM path 字符串或 load/save/read + 行为; +- 未改变 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 的参数和 +tool-table load/save/result/backing text groups 是否还能进一步局部常量化或复用 existing +helpers;只改测试胶水,不改变输入、OPFS path、WASM path 字符串或保存/读取行为。 diff --git a/wasm-port/tests/browser/interp_smoke.html b/wasm-port/tests/browser/interp_smoke.html index 4c81e61..11aba9c 100644 --- a/wasm-port/tests/browser/interp_smoke.html +++ b/wasm-port/tests/browser/interp_smoke.html @@ -9329,10 +9329,14 @@ "/work/browser-direct.var", ); const browserDirectInitialParameterValues = opfsParameterValueSet("10.5", "20.25", "2.25", "44"); + const browserDirectRestoreParameterResultLines = opfsParameterResultLinesForValues( + "restore", + browserDirectInitialParameterValues, + ); verifyExpectedOutput( "restore_parameters_direct", interp.restoreParameters(browserParameterFilePath), - opfsParameterResultLinesForValues("restore", browserDirectInitialParameterValues).join("\n"), + browserDirectRestoreParameterResultLines.join("\n"), ); const browserDirectParameterValues = opfsParameterValueSet(12.34, 56.78, 9.87, 66.6); const browserDirectParameterExpectedValues = opfsParameterValueSet("12.34", "56.78", "9.87", "66.6"); @@ -9342,23 +9346,33 @@ "9.870000", "66.600000", ); + const browserDirectSaveParameterResultLines = opfsParameterResultLinesForValues( + "save", + browserDirectParameterExpectedValues, + ); verifyExpectedOutput( "save_parameters_direct", interp.saveParameters( browserParameterFilePath, opfsParameterValuesForValueSet(browserDirectParameterValues), ), - opfsParameterResultLinesForValues("save", browserDirectParameterExpectedValues).join("\n"), + browserDirectSaveParameterResultLines.join("\n"), + ); + const browserDirectSavedParameterTextLines = opfsSavedParameterTextLinesForValues( + browserDirectParameterReadbackValues, ); verifyExpectedOutput( "saved_parameters_direct_text", interp.readTextFile(browserParameterFilePath), - opfsSavedParameterTextLinesForValues(browserDirectParameterReadbackValues).join("\n"), + browserDirectSavedParameterTextLines.join("\n"), + ); + const browserDirectSavedParameterBackupTextLines = opfsSavedParameterBackupTextLinesForValues( + browserDirectInitialParameterValues, ); verifyExpectedOutput( "saved_parameters_direct_backup", interp.readTextFile(`${browserParameterFilePath}.bak`), - opfsSavedParameterBackupTextLinesForValues(browserDirectInitialParameterValues).join("\n"), + browserDirectSavedParameterBackupTextLines.join("\n"), ); const browserDirectToolTableInputLines = [ @@ -9530,10 +9544,14 @@ wasm: browserInterpWasmPaths, }, ); + const browserInterpRestoreParameterResultLines = opfsParameterResultLinesForValues( + "restore", + browserInterpInitialParameterValues, + ); verifyOpfsLoadResult( "opfs_restore_parameters", loadedSession.parameters, - opfsParameterResultLinesForValues("restore", browserInterpInitialParameterValues), + browserInterpRestoreParameterResultLines, ); const browserInterpToolTable = opfsToolTableToolValues( "2", @@ -9579,21 +9597,31 @@ OPFS_DEFAULT_PARAMETER_FILENAME, browserInterpWasmPaths.parameters, ); + const browserInterpSaveParameterResultLines = opfsParameterResultLinesForValues( + "save", + browserInterpParameterExpectedValues, + ); verifyOpfsSaveResult( "opfs_save_parameters", savedParameters, - opfsParameterResultLinesForValues("save", browserInterpParameterExpectedValues), + browserInterpSaveParameterResultLines, + ); + const browserInterpSavedParameterTextLines = opfsSavedParameterTextLinesForValues( + browserInterpParameterReadbackValues, ); await verifyOpfsMachineFileReadback( "opfs_saved_parameter_text", browserInterpMachineId, "parameters", - opfsSavedParameterTextLinesForValues(browserInterpParameterReadbackValues), + browserInterpSavedParameterTextLines, + ); + const browserInterpSavedParameterBackupTextLines = opfsSavedParameterBackupTextLinesForValues( + browserInterpInitialParameterValues, ); await verifyOpfsReadback( "opfs_saved_parameter_backup_text", savedParameters.backupOpfsPath, - opfsSavedParameterBackupTextLinesForValues(browserInterpInitialParameterValues), + browserInterpSavedParameterBackupTextLines, ); const savedToolTable = await saveMachineToolTableToOpfs( interp,