diff --git a/text7.txt b/text7.txt index acc9054..19239d9 100644 --- a/text7.txt +++ b/text7.txt @@ -760,3 +760,67 @@ parameter/tool table runtime state tests 和 blocked runtime promotion。 ```bash git status --short && git log -5 --oneline && tail -n 120 text7.txt && awk '/^[一二三四五六七八九十百]+、/ {print}' text7.txt | sort | uniq -d ``` + +十五、2026-06-13 继续执行记录:cam-nisley bare direct staging guard + +1. 本批目标。 + +继续 staged path guard inventory 第十轮,处理 Node/browser 成对覆盖的 +`cam-nisley-bare` direct `runFile(...)` 路径: + +```text +/work/interp/cam-nisley-bare/cam.ngc +/work/browser-interp/cam-nisley-bare/cam.ngc +``` + +2. 已完成改动。 + +- Node 侧将 bare `cam.ngc` staged path 提取为 `camNisleyBarePath`; +- Node 侧使用 `assertInterpRegressionFileStaging(...)` 检查 staged path; +- browser 侧将 bare `cam.ngc` staged path 提取为 `camNisleyBarePath`; +- browser 侧使用 `assertInterpRegressionFileStaging(...)` 检查 staged path; +- 写入和 `runFile(...)` 均使用同一个 guarded path; +- browser 侧仍不枚举目录; +- 未修改 upstream `cam.ngc`、expected output 或 interpreter 语义。 + +涉及文件: + +```text +wasm-port/tests/wasm/node/verify_interp_wasm.mjs +wasm-port/tests/browser/interp_smoke.html +``` + +3. 已完成的目标验证。 + +```bash +git diff --check +SKIP_INTERP_BUILD=1 wasm-port/tests/wasm/node/verify_interp_wasm.sh +SKIP_INI_BUILD=1 SKIP_INTERP_BUILD=1 wasm-port/tests/browser/verify_interp_browser.sh +``` + +4. 本批剩余建议验证。 + +```bash +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_sim_configs_inventory_wasm.sh +wasm-port/tests/host/verify_host_smokes.sh +``` + +如果通过,提交建议: + +```text +Guard cam-nisley bare staging +``` + +5. 下一步工作建议。 + +继续 staged path guard inventory 第十一轮,优先处理 `g52/g92-persistence` 固定 +staging directory,增加 fixed manifest/root parity guard;继续避开 parameter/tool +table runtime state tests 和 blocked runtime promotion。 + +下一轮第一条命令仍保持: + +```bash +git status --short && git log -5 --oneline && tail -n 120 text7.txt && awk '/^[一二三四五六七八九十百]+、/ {print}' text7.txt | sort | uniq -d +``` diff --git a/wasm-port/tests/browser/interp_smoke.html b/wasm-port/tests/browser/interp_smoke.html index 303f082..c85bd9a 100644 --- a/wasm-port/tests/browser/interp_smoke.html +++ b/wasm-port/tests/browser/interp_smoke.html @@ -6757,14 +6757,16 @@ console.error(message); }, }); + const camNisleyBarePath = "/work/browser-interp/cam-nisley-bare/cam.ngc"; + assertInterpRegressionFileStaging("cam-nisley-bare", "cam.ngc", camNisleyBarePath); await writeFetchedTextFile( camNisleyBareInterp, "../../vendor/linuxcnc/tests/interp/cam-nisley/cam.ngc", - "/work/browser-interp/cam-nisley-bare/cam.ngc", + camNisleyBarePath, ); verifyExpectedOutput( "browser_interp_cam_nisley_bare", - camNisleyBareInterp.runFile("/work/browser-interp/cam-nisley-bare/cam.ngc"), + camNisleyBareInterp.runFile(camNisleyBarePath), [ "file_open=0", "file_read_count=57", diff --git a/wasm-port/tests/wasm/node/verify_interp_wasm.mjs b/wasm-port/tests/wasm/node/verify_interp_wasm.mjs index 3ef41e8..f187564 100644 --- a/wasm-port/tests/wasm/node/verify_interp_wasm.mjs +++ b/wasm-port/tests/wasm/node/verify_interp_wasm.mjs @@ -1717,14 +1717,16 @@ const camNisleyBareInterp = await createLinuxCncInterpSdk({ console.error(message); }, }); +const camNisleyBarePath = "/work/interp/cam-nisley-bare/cam.ngc"; +assertInterpRegressionFileStaging("cam-nisley-bare", "cam.ngc", camNisleyBarePath); writeVendorTextFile( resolve(rootDir, "vendor/linuxcnc/tests/interp/cam-nisley/cam.ngc"), - "/work/interp/cam-nisley-bare/cam.ngc", + camNisleyBarePath, camNisleyBareInterp, ); verifyExpectedOutput( "interp_cam_nisley_bare_wasm", - camNisleyBareInterp.runFile("/work/interp/cam-nisley-bare/cam.ngc"), + camNisleyBareInterp.runFile(camNisleyBarePath), [ "file_open=0", "file_read_count=57",