diff --git a/text6.txt b/text6.txt index 58cccf2..a27d0c2 100644 --- a/text6.txt +++ b/text6.txt @@ -2072,3 +2072,50 @@ staging helper。暂缓: staged/unstaged overlap guard。 继续避免 blocked runtime promotion、browser full inventory 扩面和 JS CNC 语义实现。 + +四十七、2026-06-13 继续执行记录:final simple remap per-file staging helper guard + +本批继续处理剩余没有 expected-unstaged 额外清单的 remap fixture: + +- `posargs.0` +- `sequencing` + +完成内容: + +- Node 侧将 `posargs.0` 从 `assertRemapRegressionStaging(...)` 切换为 + `assertRemapRegressionCoverage(...)` 加 + `assertRemapRegressionFilesStaging(...)`; +- Node 侧将 `sequencing` 同步切换为 coverage helper 加 per-file staging helper; +- browser 侧同步将上述 2 个 fixture 切换为 + `assertRemapRegressionFilesStaging(...)`; +- `sequencing/permute.py` 不是 `.ini/.ngc` staged manifest,继续不纳入 staged path + 对账; +- browser 侧仍不枚举目录; +- 仅整理 host/filesystem staging guard,不改变 remap positional args、sequencing、 + generated permutations 或 interpreter 语义。 + +已运行验证: + +```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_INI_BUILD=1 SKIP_INTERP_BUILD=1 wasm-port/tests/browser/verify_interp_browser.sh +SKIP_INTERP_BUILD=1 wasm-port/tests/wasm/node/verify_sim_configs_inventory_wasm.sh +wasm-port/tests/host/verify_host_smokes.sh +``` + +结果:全部通过。 + +下一步建议: + +remap aggregate helper 仅剩两个特殊 case: + +- `nested-remaps-oword`:含 expected-unstaged `testsub.ngc`,下一批建议优先处理, + 但必须保留 coverage helper 的 staged + expected-unstaged manifest 精确对账和 + overlap guard; +- `remap-io`:除 vendored file list 外,还有运行时生成的 `simpockets.tbl` 单独 + staged path guard,建议留到最后单独处理。 + +继续避免 blocked runtime promotion、browser full inventory 扩面和 JS CNC 语义实现。 diff --git a/wasm-port/tests/browser/interp_smoke.html b/wasm-port/tests/browser/interp_smoke.html index 5b4e44e..f040ea6 100644 --- a/wasm-port/tests/browser/interp_smoke.html +++ b/wasm-port/tests/browser/interp_smoke.html @@ -6245,7 +6245,7 @@ "rg881.ngc", ]; const posargs0Dir = await writeRemapRegressionFiles(interp, "posargs.0", posargs0Files); - assertRemapRegressionStaging("posargs.0", posargs0Files, posargs0Dir); + assertRemapRegressionFilesStaging("posargs.0", posargs0Files, posargs0Dir); verifyExpectedOutput( "browser_posargs_0_remap", interp.runRemapFile( @@ -6285,7 +6285,7 @@ "rm410.ngc", ]; const sequencingDir = await writeRemapRegressionFiles(interp, "sequencing", sequencingFiles); - assertRemapRegressionStaging("sequencing", sequencingFiles, sequencingDir); + assertRemapRegressionFilesStaging("sequencing", sequencingFiles, sequencingDir); verifyExpectedOutput( "browser_sequencing_remap", interp.runRemapFile( diff --git a/wasm-port/tests/wasm/node/verify_interp_wasm.mjs b/wasm-port/tests/wasm/node/verify_interp_wasm.mjs index faf0b1e..bd90ce1 100644 --- a/wasm-port/tests/wasm/node/verify_interp_wasm.mjs +++ b/wasm-port/tests/wasm/node/verify_interp_wasm.mjs @@ -1256,7 +1256,8 @@ const posargs0Files = [ "rg881.ngc", ]; const posargs0Dir = writeRemapRegressionFiles("posargs.0", posargs0Files); -assertRemapRegressionStaging("posargs.0", posargs0Files, posargs0Dir); +assertRemapRegressionCoverage("posargs.0", posargs0Files); +assertRemapRegressionFilesStaging("posargs.0", posargs0Files, posargs0Dir); verifyExpectedOutput( "posargs_0_remap_wasm", interp.runRemapFile( @@ -1296,7 +1297,8 @@ const sequencingFiles = [ "rm410.ngc", ]; const sequencingDir = writeRemapRegressionFiles("sequencing", sequencingFiles); -assertRemapRegressionStaging("sequencing", sequencingFiles, sequencingDir); +assertRemapRegressionCoverage("sequencing", sequencingFiles); +assertRemapRegressionFilesStaging("sequencing", sequencingFiles, sequencingDir); verifyExpectedOutput( "sequencing_remap_wasm", interp.runRemapFile(