test/wcc: carrier ownership repair and driver-contract adaptation

Every surviving carrier now owns its artifacts: checked mkdir/mkdtemp/ fopen acquisition, one all-exit cleanup funnel per carrier, ENOENT- tolerant checked unlinks, exact-path deletion (rm -rf only for an owned pid-keyed dir or a .sepwork beneath one), and cleanup failure fails a passing carrier without overwriting its diagnostic. In the same pass the carriers adapt to the driver contract this branch lands: --sep and WW_PKGCACHE are gone, -S and the /tmp/ww_run_<pid> scratch contract are asserted, and rows whose runtime or reject coverage moved to test/wcc/data fixtures or test/lang @test owners are trimmed to the byte/artifact/diagnostic observations only they can make. Repair and adaptation ride together because most files interleave both in the same hunks; splitting would manufacture intermediate carrier states that never existed and cannot run against either driver.
2026-08-07 23:02:47 +09:00
parent b2899dd8d3
commit a95a7a316b
132 changed files with 7573 additions and 6172 deletions
--- a/test/wcc/797_xmod_struct_field_layout_collide_run.c
+++ b/test/wcc/797_xmod_struct_field_layout_collide_run.c
@@ -1,5 +1,5 @@
 /*
- * 794_xmod_struct_field_layout_collide_run — project #31 (RULING R2,
+ * 797_xmod_struct_field_layout_collide_run — project #31 (RULING R2,
 * commit-1: the OFFSET/SIZE align-up arms) runtime + byte-id net. The
 * direct continuation of 793 (#21): #21 type-keyed the THREE caller-side
 * sites the 793 collision drove (push/recv/field-read); #31 closes the
@@ -59,7 +59,7 @@
 *
 * Each row reddens under an INDEPENDENT revert of its arm (verified
 * impl-side: R1 ww=101, C1 cs!=ww OOB, A1/A2 ww=8, W1/W2 ww=107 cs!=ww).
- * cstage `ww build --sep` + run pins runtime; the wwstage binary is run too
+ * cstage `ww build` + run pins runtime; the wwstage binary is run too
 * (the bug WAS a wrong wwstage runtime value / OOB); raw cs.s vs ww.s over
 * the driver-produced per-package asm pins rule-10 byte-id.
 *
@@ -72,6 +72,7 @@
 */
 #include <stdio.h>
 #include <stdlib.h>
+#include <errno.h>
 #include <unistd.h>
 #include <sys/stat.h>
 #include <sys/wait.h>
@@ -98,7 +99,9 @@ slurp_eq(const char *a, const char *b)
 		if (ca != cb) { rc = -1; break; }
 		if (ca == EOF) break;
 	}
-	fclose(fa); fclose(fb);
+	if (ferror(fa) || ferror(fb)) rc = -1;
+	if (fclose(fa) != 0) rc = -1;
+	if (fclose(fb) != 0) rc = -1;
 	return rc;
 }

@@ -303,9 +306,9 @@ static const struct scenario scenarios[] = {
 static int
 run_scenario(const char *cdrv, const char *wdrv, const struct scenario *sc)
 {
-	char dir[] = "/tmp/ww794_XXXXXX";
+	char dir[] = "/tmp/ww797_XXXXXX";
 	if (mkdtemp(dir) == NULL) {
-		fprintf(stderr, "794[%s]: mkdtemp failed\n", sc->label);
+		fprintf(stderr, "797[%s]: mkdtemp failed\n", sc->label);
 		return -1;
 	}

@@ -315,38 +318,40 @@ run_scenario(const char *cdrv, const char *wdrv, const struct scenario *sc)
 	for (int i = 0; sc->files[i].name; i++) {
 		snprintf(path, sizeof path, "%s/%s", dir, sc->files[i].name);
 		FILE *f = fopen(path, "wb");
-		if (!f) { fprintf(stderr, "794[%s]: write %s\n", sc->label,
+		if (!f) { fprintf(stderr, "797[%s]: write %s\n", sc->label,
+		    sc->files[i].name); rc = -1; goto done; }
+		int bad = fputs(sc->files[i].src, f) == EOF;
+		if (fclose(f) != 0) bad = 1;
+		if (bad) { fprintf(stderr, "797[%s]: write %s\n", sc->label,
 		    sc->files[i].name); rc = -1; goto done; }
-		fputs(sc->files[i].src, f);
-		fclose(f);
 	}

 	snprintf(cmd, sizeof cmd,
-	    "cd %s && WW_PKGCACHE=%s/pkgc_c %s build --sep -I %s -o %s/main %s/main.ww",
-	    dir, dir, cdrv, dir, dir, dir);
+	    "cd %s && %s build -I %s -o %s/main %s/main.ww",
+	    dir, cdrv, dir, dir, dir);
 	if (runwait(cmd) != 0) {
-		fprintf(stderr, "794[%s]: cstage build failed\n", sc->label);
+		fprintf(stderr, "797[%s]: cstage build failed\n", sc->label);
 		rc = -1; goto done;
 	}
 	snprintf(path, sizeof path, "%s/main", dir);
 	int gotc = runwait(path);
 	if (gotc != sc->want_exit) {
-		fprintf(stderr, "794[%s]: cstage exit %d, want %d\n",
+		fprintf(stderr, "797[%s]: cstage exit %d, want %d\n",
 		    sc->label, gotc, sc->want_exit);
 		rc = -1;
 	}

 	snprintf(cmd, sizeof cmd,
-	    "cd %s && WW_PKGCACHE=%s/pkgc_w %s build --sep -I %s -o %s/mainww %s/main.ww",
-	    dir, dir, wdrv, dir, dir, dir);
+	    "cd %s && %s build -I %s -o %s/mainww %s/main.ww",
+	    dir, wdrv, dir, dir, dir);
 	if (runwait(cmd) != 0) {
-		fprintf(stderr, "794[%s]: ww_ww build failed\n", sc->label);
+		fprintf(stderr, "797[%s]: ww_ww build failed\n", sc->label);
 		rc = -1; goto done;
 	}
 	snprintf(path, sizeof path, "%s/mainww", dir);
 	int gotw = runwait(path);
 	if (gotw != sc->want_exit) {
-		fprintf(stderr, "794[%s]: wwstage exit %d, want %d\n",
+		fprintf(stderr, "797[%s]: wwstage exit %d, want %d\n",
 		    sc->label, gotw, sc->want_exit);
 		rc = -1;
 	}
@@ -354,19 +359,56 @@ run_scenario(const char *cdrv, const char *wdrv, const struct scenario *sc)
 	char cs_s[1024], ws_s[1024];
 	snprintf(cs_s, sizeof cs_s, "%s/all_cs.s", dir);
 	snprintf(ws_s, sizeof ws_s, "%s/all_ww.s", dir);
-	snprintf(cmd, sizeof cmd, "cat %s/main.sepwork/*.s > %s 2>/dev/null",
-	    dir, cs_s); if (system(cmd)) {}
-	snprintf(cmd, sizeof cmd, "cat %s/mainww.sepwork/*.s > %s 2>/dev/null",
-	    dir, ws_s); if (system(cmd)) {}
+	snprintf(cmd, sizeof cmd,
+	    "cat %s/main.sepwork/*.s > %s 2>/dev/null && test -s %s",
+	    dir, cs_s, cs_s);
+	if (runwait(cmd) != 0) {
+		fprintf(stderr, "797[%s]: cstage asm aggregation failed\n",
+		    sc->label);
+		rc = -1; goto done;
+	}
+	snprintf(cmd, sizeof cmd,
+	    "cat %s/mainww.sepwork/*.s > %s 2>/dev/null && test -s %s",
+	    dir, ws_s, ws_s);
+	if (runwait(cmd) != 0) {
+		fprintf(stderr, "797[%s]: wwstage asm aggregation failed\n",
+		    sc->label);
+		rc = -1; goto done;
+	}
 	if (slurp_eq(cs_s, ws_s) != 0) {
-		fprintf(stderr, "794[%s]: cs.s/ww.s DIFFER (rule-10 byte-id "
+		fprintf(stderr, "797[%s]: cs.s/ww.s DIFFER (rule-10 byte-id "
 		    "violation — #31 regression)\n", sc->label);
 		rc = -1;
 	}

 done:
-	snprintf(cmd, sizeof cmd, "rm -rf %s", dir);
-	(void)runwait(cmd);
+	snprintf(cmd, sizeof cmd, "rm -rf %s/main.sepwork", dir);
+	if (runwait(cmd) != 0) { fprintf(stderr, "797[%s]: cleanup main.sepwork\n",
+	    sc->label); rc = -1; }
+	snprintf(cmd, sizeof cmd, "rm -rf %s/mainww.sepwork", dir);
+	if (runwait(cmd) != 0) { fprintf(stderr, "797[%s]: cleanup mainww.sepwork\n",
+	    sc->label); rc = -1; }
+	for (int i = 0; sc->files[i].name; i++) {
+		snprintf(path, sizeof path, "%s/%s", dir, sc->files[i].name);
+		if (unlink(path) != 0 && errno != ENOENT) {
+			fprintf(stderr, "797[%s]: cleanup %s\n", sc->label,
+			    sc->files[i].name);
+			rc = -1;
+		}
+	}
+	const char *children[] = { "main", "mainww", "all_cs.s", "all_ww.s", NULL };
+	for (int i = 0; children[i]; i++) {
+		snprintf(path, sizeof path, "%s/%s", dir, children[i]);
+		if (unlink(path) != 0 && errno != ENOENT) {
+			fprintf(stderr, "797[%s]: cleanup %s\n", sc->label,
+			    children[i]);
+			rc = -1;
+		}
+	}
+	if (rmdir(dir) != 0) {
+		fprintf(stderr, "797[%s]: cleanup directory\n", sc->label);
+		rc = -1;
+	}
 	return rc;
 }

@@ -387,7 +429,7 @@ main(void)
 	snprintf(cdrv, sizeof cdrv, "%s/ww", bin);
 	snprintf(wdrv, sizeof wdrv, "%s/ww_ww", bin);
 	if (access(wdrv, X_OK) != 0) {
-		fprintf(stderr, "794: ww_ww missing — cannot run the cs==ww "
+		fprintf(stderr, "797: ww_ww missing — cannot run the cs==ww "
 		    "byte-id gate (the whole point of this test)\n");
 		return 1;
 	}
@@ -400,7 +442,7 @@ main(void)
 	}

 	if (fail) {
-		fprintf(stderr, "794 xmod_struct_field_layout_collide: %d/%d "
+		fprintf(stderr, "797 xmod_struct_field_layout_collide: %d/%d "
 		    "scenarios failed\n", fail, n);
 		return 1;
 	}