From cba210b921bc7d927002e88f1aba416af0921b15 Mon Sep 17 00:00:00 2001 From: wangdequan Date: Sun, 14 Jun 2026 13:05:48 +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=20session=20path=20=E6=96=AD=E8=A8=80?= =?UTF-8?q?=E7=BB=84=20guard?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- text9.txt | 54 +++++++++++++++++++++++ wasm-port/tests/browser/interp_smoke.html | 41 +++++++++-------- 2 files changed, 76 insertions(+), 19 deletions(-) diff --git a/text9.txt b/text9.txt index 5977cbc..4bd67d0 100644 --- a/text9.txt +++ b/text9.txt @@ -2434,3 +2434,57 @@ host_wasm_opfs_browser_smokes=ok 继续小批量 browser test glue guard。优先扫描 machine/session path assertions 或 remaining OPFS readback groups 是否还能进一步局部常量化或复用 existing helpers;只改 测试胶水,不改变输入、OPFS path、WASM path 字符串或保存/读取行为。 + +四十七、2026-06-14 继续执行记录:browser session path assertion groups guard + +本轮按上一条下一步建议继续收敛 machine/session path assertions,范围仍只触及 +`wasm-port/tests/browser/interp_smoke.html` 的 browser/OPFS test glue。 + +完成内容: + +- 新增 `browserInterpExpectedSessionPaths` 局部常量,承载 browser-interp session + expected path group; +- 新增 `iniNamedExpectedSessionPaths` 局部常量,承载 ini-named custom session + expected path group; +- 新增 `explicitExpectedSessionPaths` 局部常量,承载 explicit override session + expected path group; +- browser-interp、ini-named 与 explicit session staging 断言改为复用上述 expected + path groups; +- 保持 session expected OPFS path、WASM path、machine id、filename 与 load options + 不变; +- 未改变任何 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。优先扫描 remaining OPFS readback groups 或 +machine text store path assertion 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 b047d1c..bd8ed77 100644 --- a/wasm-port/tests/browser/interp_smoke.html +++ b/wasm-port/tests/browser/interp_smoke.html @@ -9536,13 +9536,14 @@ browserInterpMachineId, opfsSessionLoadOptions(browserInterpWasmPaths), ); + const browserInterpExpectedSessionPaths = { + wasm: browserInterpWasmPaths, + }; assertOpfsSessionStaging( "opfs_load_session_staging", loadedSession, browserInterpMachineId, - { - wasm: browserInterpWasmPaths, - }, + browserInterpExpectedSessionPaths, ); const browserInterpRestoreParameterResultLines = opfsParameterResultLinesForValues( "restore", @@ -9806,18 +9807,19 @@ iniFileToolTableWasmPath, ), ); + const iniNamedExpectedSessionPaths = opfsCustomSessionPaths( + iniFileMachineId, + iniFileParameterFilename, + iniFileToolTableFilename, + iniFileIniWasmPath, + iniFileParameterWasmPath, + iniFileToolTableWasmPath, + ); assertOpfsSessionStaging( "opfs_load_ini_named_session_staging", loadedIniFileSession, iniFileMachineId, - opfsCustomSessionPaths( - iniFileMachineId, - iniFileParameterFilename, - iniFileToolTableFilename, - iniFileIniWasmPath, - iniFileParameterWasmPath, - iniFileToolTableWasmPath, - ), + iniNamedExpectedSessionPaths, ); const iniNamedRestoreParameterResultLines = opfsParameterResultLinesForValues( "restore", @@ -9972,18 +9974,19 @@ }, ), ); + const explicitExpectedSessionPaths = opfsCustomSessionPaths( + iniOverrideMachineId, + explicitParameterFilename, + explicitToolTableFilename, + iniOverrideIniWasmPath, + explicitParameterWasmPath, + explicitToolTableWasmPath, + ); assertOpfsSessionStaging( "opfs_load_explicit_session_staging", loadedIniOverrideSession, iniOverrideMachineId, - opfsCustomSessionPaths( - iniOverrideMachineId, - explicitParameterFilename, - explicitToolTableFilename, - iniOverrideIniWasmPath, - explicitParameterWasmPath, - explicitToolTableWasmPath, - ), + explicitExpectedSessionPaths, ); const explicitRestoreParameterResultLines = opfsParameterResultLinesForValues( "restore",