wangdequan/cnc_wams
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Guard final interp per-file staging paths

Browse Source
This commit is contained in:
wangdequan
2026-06-13 12:49:17 +08:00
parent 6f95135093
commit 08e10c7b5a
3 changed files with 69 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
wasm-port/tests/browser/interp_smoke.html
View File

@@ -4705,16 +4705,6 @@
return wasmDir;
}
function assertInterpRegressionStaging(name, files, wasmDir) {
if (files.length === 0 || new Set(files).size !== files.length) {
throw new Error(`browser_interp_${name}_fixture_coverage: list drift`);
}
const interpStagedRelativeFiles = files.map((file) => `${wasmDir}/${file}`.replace(`/work/browser-interp/${name}/`, ""));
if (interpStagedRelativeFiles.join(",") !== files.join(",")) {
throw new Error(`browser_interp_${name}_staging_manifest: list drift`);
}
}
async function writeCcompRegressionFiles(interp, name) {
const sourceDir = `../../vendor/linuxcnc/tests/ccomp/${name}`;
const wasmDir = `/work/browser-ccomp/${name}`;
@@ -6374,7 +6364,7 @@
"do-while-break",
doWhileBreakNgcFiles,
);
assertInterpRegressionStaging("do-while-break", doWhileBreakNgcFiles, doWhileBreakDir);
assertInterpRegressionFilesStaging("do-while-break", doWhileBreakNgcFiles, doWhileBreakDir);
const doWhileBreakPath = `${doWhileBreakDir}/test.ngc`;
verifyExpectedOutput(
"browser_interp_do_while_break",
@@ -6599,7 +6589,7 @@
"test.tbl",
];
const camNisleyDir = await writeInterpRegressionFiles(interp, "cam-nisley", camNisleyFiles);
assertInterpRegressionStaging("cam-nisley", camNisleyFiles, camNisleyDir);
assertInterpRegressionFilesStaging("cam-nisley", camNisleyFiles, camNisleyDir);
interp.writeTextFile(
`${camNisleyDir}/test.ini`,
[
@@ -7296,7 +7286,7 @@
"test.tbl",
];
const g76Dir = await writeInterpRegressionFiles(interp, "g76", g76Files);
assertInterpRegressionStaging("g76", g76Files, g76Dir);
assertInterpRegressionFilesStaging("g76", g76Files, g76Dir);
interp.writeTextFile(
`${g76Dir}/test.ini`,
[
@@ -8292,7 +8282,7 @@
"m98m99/13-named-program",
m98m99NamedProgramFiles,
);
assertInterpRegressionStaging(
assertInterpRegressionFilesStaging(
"m98m99/13-named-program",
m98m99NamedProgramFiles,
m98m99NamedProgramDir,

24
wasm-port/tests/wasm/node/verify_interp_wasm.mjs
View File

@@ -323,15 +323,6 @@ function assertInterpRegressionFilesStaging(name, files, wasmDir) {
}
}
function assertInterpRegressionStaging(name, files, wasmDir) {
assertInterpRegressionFilesCoverage(name, files);
assert.deepEqual(
files.map((file) => `${wasmDir}/${file}`),
files.map((file) => `/work/interp/${name}/${file}`),
`interp ${name} staging manifest drift`,
);
}
function interpRegressionNgcFiles(name) {
const sourceDir = resolve(rootDir, "vendor/linuxcnc/tests/interp", name);
return readdirSync(sourceDir)
@@ -1365,7 +1356,8 @@ const doWhileBreakNgcFiles = [
"test.ngc",
];
const doWhileBreakDir = writeInterpRegressionFiles("do-while-break", doWhileBreakNgcFiles);
assertInterpRegressionStaging("do-while-break", doWhileBreakNgcFiles, doWhileBreakDir);
assertInterpRegressionFilesCoverage("do-while-break", doWhileBreakNgcFiles);
assertInterpRegressionFilesStaging("do-while-break", doWhileBreakNgcFiles, doWhileBreakDir);
const doWhileBreakPath = `${doWhileBreakDir}/test.ngc`;
verifyExpectedOutput(
"interp_do_while_break_wasm",
@@ -1583,7 +1575,8 @@ const camNisleyFiles = [
"test.tbl",
];
const camNisleyDir = writeInterpRegressionFiles("cam-nisley", camNisleyFiles);
assertInterpRegressionStaging("cam-nisley", camNisleyFiles, camNisleyDir);
assertInterpRegressionFilesCoverage("cam-nisley", camNisleyFiles);
assertInterpRegressionFilesStaging("cam-nisley", camNisleyFiles, camNisleyDir);
interp.writeTextFile(
`${camNisleyDir}/test.ini`,
[
@@ -2265,7 +2258,8 @@ const g76Files = [
"test.tbl",
];
const g76Dir = writeInterpRegressionFiles("g76", g76Files);
assertInterpRegressionStaging("g76", g76Files, g76Dir);
assertInterpRegressionFilesCoverage("g76", g76Files);
assertInterpRegressionFilesStaging("g76", g76Files, g76Dir);
interp.writeTextFile(
`${g76Dir}/test.ini`,
[
@@ -3247,7 +3241,11 @@ const m98m99NamedProgramDir = writeInterpRegressionFiles(
"m98m99/13-named-program",
m98m99NamedProgramFiles,
);
assertInterpRegressionStaging(
assertInterpRegressionFilesCoverage(
"m98m99/13-named-program",
m98m99NamedProgramFiles,
);
assertInterpRegressionFilesStaging(
"m98m99/13-named-program",
m98m99NamedProgramFiles,
m98m99NamedProgramDir,