diff --git a/text9.txt b/text9.txt index da82ac9..d6c8cda 100644 --- a/text9.txt +++ b/text9.txt @@ -2137,3 +2137,59 @@ host_wasm_opfs_browser_smokes=ok 继续小批量 browser test glue guard。优先扫描 browser-random/direct-random tool-table load/save result line groups 是否也能局部常量化或复用 existing helpers;只改测试胶水, 不改变输入、OPFS path、WASM path 字符串或保存/读取行为。 + +四十二、2026-06-14 继续执行记录:browser random tool-table result lines guard + +本轮按上一条下一步建议继续收敛 browser-random/direct-random tool-table load/save +result line groups,范围仍只触及 `wasm-port/tests/browser/interp_smoke.html` 的 +browser/OPFS test glue。 + +完成内容: + +- 新增 `browserDirectRandomLoadToolTableResultLines` 局部常量,承载 direct-random + load tool-table expected result lines; +- 新增 `browserDirectRandomSaveToolTableResultLines` 局部常量,承载 direct-random + save tool-table expected result lines; +- 新增 `browserRandomLoadToolTableResultLines` 局部常量,承载 browser-random load + tool-table expected result lines; +- 新增 `browserRandomSaveToolTableResultLines` 局部常量,承载 browser-random save + tool-table expected result lines; +- direct-random 与 browser-random tool-table load/save 断言改为复用上述 line groups; +- 保持 direct-random/browser-random 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 tool-table +load/save result line 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 9b9f562..c1c0b3e 100644 --- a/wasm-port/tests/browser/interp_smoke.html +++ b/wasm-port/tests/browser/interp_smoke.html @@ -9469,22 +9469,24 @@ ], }; const browserDirectRandomTools = [browserDirectRandomFinishTool, browserDirectRandomRoughTool]; + const browserDirectRandomLoadToolTableResultLines = opfsRandomToolTableResultLines("load", [ + { resultLines: ["tooldata_last_index=9"] }, + ...browserDirectRandomTools, + { resultLines: ["tool_index_for_tool_2=7"] }, + ]); verifyExpectedOutput( "load_tool_table_direct_random", interp.loadToolTable(browserRandomToolTablePath, { randomToolChanger: true }), - opfsRandomToolTableResultLines("load", [ - { resultLines: ["tooldata_last_index=9"] }, - ...browserDirectRandomTools, - { resultLines: ["tool_index_for_tool_2=7"] }, - ]).join("\n"), + browserDirectRandomLoadToolTableResultLines.join("\n"), ); + const browserDirectRandomSaveToolTableResultLines = opfsRandomToolTableResultLines("save", [ + { resultLines: ["tool_pocket_7.toolno=2"] }, + { resultLines: ["tool_pocket_9.toolno=5"] }, + ]); verifyExpectedOutput( "save_tool_table_direct_random", interp.saveToolTable(browserRandomToolTablePath), - opfsRandomToolTableResultLines("save", [ - { resultLines: ["tool_pocket_7.toolno=2"] }, - { resultLines: ["tool_pocket_9.toolno=5"] }, - ]).join("\n"), + browserDirectRandomSaveToolTableResultLines.join("\n"), ); const browserDirectRandomSavedToolTableTextLines = opfsRandomToolTableTextLines( browserDirectRandomTools, @@ -9677,13 +9679,14 @@ wasm: browserRandomWasmPaths, }, ); + const browserRandomLoadToolTableResultLines = opfsRandomToolTableResultLines("load", [ + ...browserRandomTools, + { resultLines: ["tool_index_for_tool_2=7"] }, + ]); verifyOpfsLoadResult( "opfs_load_random_tool_table", loadedRandomSession.toolTable, - opfsRandomToolTableResultLines("load", [ - ...browserRandomTools, - { resultLines: ["tool_index_for_tool_2=7"] }, - ]), + browserRandomLoadToolTableResultLines, ); const savedRandomToolTable = await saveMachineToolTableToOpfs( interp, @@ -9697,13 +9700,14 @@ OPFS_DEFAULT_TOOL_TABLE_FILENAME, browserRandomWasmPaths.toolTable, ); + const browserRandomSaveToolTableResultLines = opfsRandomToolTableResultLines("save", [ + { resultLines: ["tool_pocket_7.toolno=2"] }, + { resultLines: ["tool_pocket_9.toolno=5"] }, + ]); verifyOpfsSaveResult( "opfs_save_random_tool_table", savedRandomToolTable, - opfsRandomToolTableResultLines("save", [ - { resultLines: ["tool_pocket_7.toolno=2"] }, - { resultLines: ["tool_pocket_9.toolno=5"] }, - ]), + browserRandomSaveToolTableResultLines, ); const browserRandomSavedToolTableTextLines = opfsRandomToolTableTextLines(browserRandomTools); await verifyOpfsMachineFileReadback(