From c6b0c5b7daded182ea30f8f5eee2f1f8dc976e80 Mon Sep 17 00:00:00 2001 From: wangdequan Date: Sun, 14 Jun 2026 12:42:32 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=A7=E7=BB=AD=E6=8E=A8=E8=BF=9B=E6=B5=8F?= =?UTF-8?q?=E8=A7=88=E5=99=A8=20direct/interp=20tool-table=20=E7=BB=93?= =?UTF-8?q?=E6=9E=9C=E8=A1=8C=20guard?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- text9.txt | 56 +++++++++++++++++++++++ wasm-port/tests/browser/interp_smoke.html | 39 ++++++++++------ 2 files changed, 81 insertions(+), 14 deletions(-) diff --git a/text9.txt b/text9.txt index d6c8cda..49825fc 100644 --- a/text9.txt +++ b/text9.txt @@ -2193,3 +2193,59 @@ host_wasm_opfs_browser_smokes=ok 继续小批量 browser test glue guard。优先扫描 browser-interp/direct tool-table load/save result line groups 是否也能局部常量化或复用 existing helpers；只改测试胶水， 不改变输入、OPFS path、WASM path 字符串或保存/读取行为。 + +四十三、2026-06-14 继续执行记录：browser direct/interp tool-table result lines guard + +本轮按上一条下一步建议继续收敛 browser-interp/direct tool-table load/save result line +groups，范围仍只触及 `wasm-port/tests/browser/interp_smoke.html` 的 browser/OPFS +test glue。 + +完成内容： + +- 新增 `browserDirectLoadToolTableResultLines` 局部常量，承载 direct tool-table load + expected result lines； +- 新增 `browserDirectSaveToolTableResultLines` 局部常量，承载 direct tool-table save + expected result lines； +- 新增 `browserInterpLoadToolTableResultLines` 局部常量，承载 browser-interp tool-table + load expected result lines； +- 新增 `browserInterpSaveToolTableResultLines` 局部常量，承载 browser-interp tool-table + save expected result lines； +- direct 与 browser-interp tool-table load/save 断言改为复用上述 line groups； +- 保持 direct/browser-interp session 的 expected result 文本、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。优先扫描 browser-interp/direct 参数 +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 c1c0b3e..4c81e61 100644 --- a/wasm-port/tests/browser/interp_smoke.html +++ b/wasm-port/tests/browser/interp_smoke.html @@ -9407,21 +9407,23 @@ ], }; const browserDirectTools = [browserDirectFinishTool, browserDirectRoughTool]; + const browserDirectLoadToolTableResultLines = directToolTableResultLines("load", browserDirectTools, [ + "tooldata_last_index=2", + "tool_index_for_tool_2=1", + ]); verifyExpectedOutput( "load_tool_table_direct", interp.loadToolTable(browserToolTablePath), - directToolTableResultLines("load", browserDirectTools, [ - "tooldata_last_index=2", - "tool_index_for_tool_2=1", - ]).join("\n"), + browserDirectLoadToolTableResultLines.join("\n"), ); + const browserDirectSaveToolTableResultLines = directToolTableResultLines("save", [ + { resultLines: ["tool_1.toolno=2"] }, + { resultLines: ["tool_2.toolno=5"] }, + ]); verifyExpectedOutput( "save_tool_table_direct", interp.saveToolTable(browserToolTablePath), - directToolTableResultLines("save", [ - { resultLines: ["tool_1.toolno=2"] }, - { resultLines: ["tool_2.toolno=5"] }, - ]).join("\n"), + browserDirectSaveToolTableResultLines.join("\n"), ); const browserDirectSavedToolTableTextLines = directToolTableTextLines(browserDirectTools); verifyExpectedOutput( @@ -9543,10 +9545,10 @@ "+3.125000", "+1.500000", ); - verifyOpfsLoadResult( - "opfs_load_tool_table", - loadedSession.toolTable, - opfsToolTableResultLinesForTool("load", browserInterpToolTable, [ + const browserInterpLoadToolTableResultLines = opfsToolTableResultLinesForTool( + "load", + browserInterpToolTable, + [ `tool_1.z=${browserInterpToolTable.zOffset}`, `tool_1.diameter=${browserInterpToolTable.diameter}`, "tool_1.frontangle=12", @@ -9554,7 +9556,12 @@ "tool_1.orientation=4", `tool_1.comment=${browserInterpToolTable.loadComment}`, "tool_index_for_tool_2=1", - ]), + ], + ); + verifyOpfsLoadResult( + "opfs_load_tool_table", + loadedSession.toolTable, + browserInterpLoadToolTableResultLines, ); const browserInterpParameterValues = browserDirectParameterValues; const browserInterpParameterExpectedValues = browserDirectParameterExpectedValues; @@ -9600,10 +9607,14 @@ OPFS_DEFAULT_TOOL_TABLE_FILENAME, browserInterpWasmPaths.toolTable, ); + const browserInterpSaveToolTableResultLines = opfsToolTableResultLinesForTool( + "save", + browserInterpToolTable, + ); verifyOpfsSaveResult( "opfs_save_tool_table", savedToolTable, - opfsToolTableResultLinesForTool("save", browserInterpToolTable), + browserInterpSaveToolTableResultLines, ); const browserInterpSavedToolTableTextLines = opfsToolTableTextLinesForTool( browserInterpToolTable,