Guard initial remap staging paths

wasm-port/tests/browser/interp_smoke.html

@@ -4647,6 +4647,16 @@
       return wasmDir;
     }
 
+    function assertRemapRegressionStaging(name, files, wasmDir) {
+      if (files.length === 0 || new Set(files).size !== files.length) {
+        throw new Error(`browser_remap_${name}_fixture_coverage: list drift`);
+      }
+      const remapStagedRelativeFiles = files.map((file) => `${wasmDir}/${file}`.replace(`/work/browser-remap/${name}/`, ""));
+      if (remapStagedRelativeFiles.join(",") !== files.join(",")) {
+        throw new Error(`browser_remap_${name}_staging_manifest: list drift`);
+      }
+    }
+
     async function writeInterpRegressionFile(interp, name, filename) {
       const sourceDir = `../../vendor/linuxcnc/tests/interp/${name}`;
       const wasmDir = `/work/browser-interp/${name}`;
@@ -5951,12 +5961,14 @@
         ].join("\n"),
       );
 
-      const duplicateOwordDir = await writeRemapRegressionFiles(interp, "duplicate-o-word", [
+      const duplicateOwordFiles = [
         "test.ini",
         "test.ngc",
         "rm207.ngc",
         "rm208.ngc",
-      ]);
+      ];
+      const duplicateOwordDir = await writeRemapRegressionFiles(interp, "duplicate-o-word", duplicateOwordFiles);
+      assertRemapRegressionStaging("duplicate-o-word", duplicateOwordFiles, duplicateOwordDir);
       verifyExpectedOutput(
         "browser_duplicate_oword_remap",
         interp.runRemapFile(
@@ -5984,11 +5996,13 @@
         ].join("\n"),
       );
 
-      const failArgs0Dir = await writeRemapRegressionFiles(interp, "fail/args.0", [
+      const failArgs0Files = [
         "test.ini",
         "test.ngc",
         "rm400.ngc",
-      ]);
+      ];
+      const failArgs0Dir = await writeRemapRegressionFiles(interp, "fail/args.0", failArgs0Files);
+      assertRemapRegressionStaging("fail/args.0", failArgs0Files, failArgs0Dir);
       verifyExpectedOutput(
         "browser_fail_args_0_remap",
         interp.runRemapFile(
@@ -6011,11 +6025,13 @@
         ].join("\n"),
       );
 
-      const failArgs1Dir = await writeRemapRegressionFiles(interp, "fail/args.1", [
+      const failArgs1Files = [
         "test.ini",
         "test.ngc",
         "rm400.ngc",
-      ]);
+      ];
+      const failArgs1Dir = await writeRemapRegressionFiles(interp, "fail/args.1", failArgs1Files);
+      assertRemapRegressionStaging("fail/args.1", failArgs1Files, failArgs1Dir);
       verifyExpectedOutput(
         "browser_fail_args_1_remap",
         interp.runRemapFileContinueOnError(
@@ -6034,11 +6050,13 @@
         ].join("\n"),
       );
 
-      const failArgs2Dir = await writeRemapRegressionFiles(interp, "fail/args.2", [
+      const failArgs2Files = [
         "test.ini",
         "test.ngc",
         "rm400.ngc",
-      ]);
+      ];
+      const failArgs2Dir = await writeRemapRegressionFiles(interp, "fail/args.2", failArgs2Files);
+      assertRemapRegressionStaging("fail/args.2", failArgs2Files, failArgs2Dir);
       verifyExpectedOutput(
         "browser_fail_args_2_remap",
         interp.runRemapFileContinueOnError(
@@ -6057,11 +6075,13 @@
         ].join("\n"),
       );
 
-      const failBodyNgcDir = await writeRemapRegressionFiles(interp, "fail/body-ngc", [
+      const failBodyNgcFiles = [
         "test.ini",
         "test.ngc",
         "rm400.ngc",
-      ]);
+      ];
+      const failBodyNgcDir = await writeRemapRegressionFiles(interp, "fail/body-ngc", failBodyNgcFiles);
+      assertRemapRegressionStaging("fail/body-ngc", failBodyNgcFiles, failBodyNgcDir);
       verifyExpectedOutput(
         "browser_fail_body_ngc_remap",
         interp.runRemapFileContinueOnError(
@@ -6083,11 +6103,13 @@
         ].join("\n"),
       );
 
-      const m30InteractionDir = await writeRemapRegressionFiles(interp, "m30-interaction", [
+      const m30InteractionFiles = [
         "test.ini",
         "test.ngc",
         "rm400.ngc",
-      ]);
+      ];
+      const m30InteractionDir = await writeRemapRegressionFiles(interp, "m30-interaction", m30InteractionFiles);
+      assertRemapRegressionStaging("m30-interaction", m30InteractionFiles, m30InteractionDir);
       verifyExpectedOutput(
         "browser_m30_interaction_remap",
         interp.runRemapFile(

wasm-port/tests/wasm/node/verify_interp_wasm.mjs

@@ -246,6 +246,22 @@ function writeRemapRegressionFiles(name, files) {
   return wasmDir;
 }
 
+function assertRemapRegressionStaging(name, files, wasmDir) {
+  const sourceDir = resolve(rootDir, "vendor/linuxcnc/tests/remap", name);
+  assert.deepEqual(
+    readdirSync(sourceDir)
+      .filter((filename) => filename.endsWith(".ini") || filename.endsWith(".ngc"))
+      .sort(),
+    [...files].sort(),
+    `remap ${name} fixture coverage drift`,
+  );
+  assert.deepEqual(
+    files.map((file) => `${wasmDir}/${file}`),
+    files.map((file) => `/work/remap/${name}/${file}`),
+    `remap ${name} staging manifest drift`,
+  );
+}
+
 function writeInterpRegressionFile(name, filename) {
   const sourceDir = resolve(rootDir, "vendor/linuxcnc/tests/interp", name);
   const wasmDir = `/work/interp/${name}`;
@@ -921,12 +937,14 @@ verifyExpectedOutput(
   ].join("\n"),
 );
 
-const duplicateOwordDir = writeRemapRegressionFiles("duplicate-o-word", [
+const duplicateOwordFiles = [
   "test.ini",
   "test.ngc",
   "rm207.ngc",
   "rm208.ngc",
-]);
+];
+const duplicateOwordDir = writeRemapRegressionFiles("duplicate-o-word", duplicateOwordFiles);
+assertRemapRegressionStaging("duplicate-o-word", duplicateOwordFiles, duplicateOwordDir);
 verifyExpectedOutput(
   "duplicate_oword_remap_wasm",
   interp.runRemapFile(
@@ -954,11 +972,13 @@ verifyExpectedOutput(
   ].join("\n"),
 );
 
-const failArgs0Dir = writeRemapRegressionFiles("fail/args.0", [
+const failArgs0Files = [
   "test.ini",
   "test.ngc",
   "rm400.ngc",
-]);
+];
+const failArgs0Dir = writeRemapRegressionFiles("fail/args.0", failArgs0Files);
+assertRemapRegressionStaging("fail/args.0", failArgs0Files, failArgs0Dir);
 verifyExpectedOutput(
   "fail_args_0_remap_wasm",
   interp.runRemapFile(
@@ -981,11 +1001,13 @@ verifyExpectedOutput(
   ].join("\n"),
 );
 
-const failArgs1Dir = writeRemapRegressionFiles("fail/args.1", [
+const failArgs1Files = [
   "test.ini",
   "test.ngc",
   "rm400.ngc",
-]);
+];
+const failArgs1Dir = writeRemapRegressionFiles("fail/args.1", failArgs1Files);
+assertRemapRegressionStaging("fail/args.1", failArgs1Files, failArgs1Dir);
 verifyExpectedOutput(
   "fail_args_1_remap_wasm",
   interp.runRemapFileContinueOnError(
@@ -1004,11 +1026,13 @@ verifyExpectedOutput(
   ].join("\n"),
 );
 
-const failArgs2Dir = writeRemapRegressionFiles("fail/args.2", [
+const failArgs2Files = [
   "test.ini",
   "test.ngc",
   "rm400.ngc",
-]);
+];
+const failArgs2Dir = writeRemapRegressionFiles("fail/args.2", failArgs2Files);
+assertRemapRegressionStaging("fail/args.2", failArgs2Files, failArgs2Dir);
 verifyExpectedOutput(
   "fail_args_2_remap_wasm",
   interp.runRemapFileContinueOnError(
@@ -1027,11 +1051,13 @@ verifyExpectedOutput(
   ].join("\n"),
 );
 
-const failBodyNgcDir = writeRemapRegressionFiles("fail/body-ngc", [
+const failBodyNgcFiles = [
   "test.ini",
   "test.ngc",
   "rm400.ngc",
-]);
+];
+const failBodyNgcDir = writeRemapRegressionFiles("fail/body-ngc", failBodyNgcFiles);
+assertRemapRegressionStaging("fail/body-ngc", failBodyNgcFiles, failBodyNgcDir);
 verifyExpectedOutput(
   "fail_body_ngc_remap_wasm",
   interp.runRemapFileContinueOnError(
@@ -1053,11 +1079,13 @@ verifyExpectedOutput(
   ].join("\n"),
 );
 
-const m30InteractionDir = writeRemapRegressionFiles("m30-interaction", [
+const m30InteractionFiles = [
   "test.ini",
   "test.ngc",
   "rm400.ngc",
-]);
+];
+const m30InteractionDir = writeRemapRegressionFiles("m30-interaction", m30InteractionFiles);
+assertRemapRegressionStaging("m30-interaction", m30InteractionFiles, m30InteractionDir);
 verifyExpectedOutput(
   "m30_interaction_remap_wasm",
   interp.runRemapFile(