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.
This commit is contained in:
@@ -32,30 +32,37 @@ main(void)
|
||||
|
||||
char dir[64];
|
||||
snprintf(dir, sizeof dir, "/tmp/wwarch_%d", getpid());
|
||||
mkdir(dir, 0755);
|
||||
if (mkdir(dir, 0755) != 0) {
|
||||
perror(dir);
|
||||
return 1;
|
||||
}
|
||||
int result = 1;
|
||||
|
||||
/* lib_good.ww — defines f1() (→ main.f1 under strict-package #24a) */
|
||||
char path[256];
|
||||
snprintf(path, sizeof path, "%s/lib_good.ww", dir);
|
||||
FILE *f = fopen(path, "wb");
|
||||
if (!f) { perror(path); goto cleanup; }
|
||||
wwtest_fputs("export fn f1() i32 = { return 7; };", f);
|
||||
fclose(f);
|
||||
if (fclose(f) != 0) { perror(path); goto cleanup; }
|
||||
|
||||
/* lib_bad.ww — defines f2() but also references an undefined extern */
|
||||
snprintf(path, sizeof path, "%s/lib_bad.ww", dir);
|
||||
f = fopen(path, "wb");
|
||||
if (!f) { perror(path); goto cleanup; }
|
||||
wwtest_fputs("@symbol(\"this_symbol_does_not_exist\") fn bogus() i32;\n"
|
||||
"export fn f2() i32 = { return bogus(); };", f);
|
||||
fclose(f);
|
||||
if (fclose(f) != 0) { perror(path); goto cleanup; }
|
||||
|
||||
/* main.ww — calls f1, NOT f2. The plain prototype declares f1 in the
|
||||
* same (main) module, so the call resolves to main.f1 — matching
|
||||
* lib_good's moduled definition (no @symbol bare-pin needed). */
|
||||
snprintf(path, sizeof path, "%s/m.ww", dir);
|
||||
f = fopen(path, "wb");
|
||||
if (!f) { perror(path); goto cleanup; }
|
||||
wwtest_fputs("fn f1() i32;\n"
|
||||
"fn main() i32 = { return f1(); };", f);
|
||||
fclose(f);
|
||||
if (fclose(f) != 0) { perror(path); goto cleanup; }
|
||||
|
||||
char cmd[2048];
|
||||
snprintf(cmd, sizeof cmd,
|
||||
@@ -65,7 +72,10 @@ main(void)
|
||||
"ar rcs libfoo.a lib_good.o lib_bad.o && "
|
||||
"%s/w6c -o m.s m.ww && %s/w6a -o m.o m.s",
|
||||
dir, bin, bin, bin, bin, bin, bin);
|
||||
if (run(cmd) != 0) { fprintf(stderr, "build failed\n"); return 1; }
|
||||
if (run(cmd) != 0) {
|
||||
fprintf(stderr, "build failed\n");
|
||||
goto cleanup;
|
||||
}
|
||||
|
||||
/* Find start.o for the runtime */
|
||||
char startobj[256];
|
||||
@@ -75,8 +85,6 @@ main(void)
|
||||
"%s/w6l -o %s/m %s/m.o %s %s/libfoo.a 2>%s/link.err",
|
||||
bin, dir, dir, startobj, dir, dir);
|
||||
if (run(cmd) != 0) {
|
||||
FILE *ef = fopen("/dev/null", "r");
|
||||
(void)ef;
|
||||
char errpath[300];
|
||||
snprintf(errpath, sizeof errpath, "%s/link.err", dir);
|
||||
FILE *e = fopen(errpath, "r");
|
||||
@@ -84,16 +92,36 @@ main(void)
|
||||
char buf[512]; size_t r = fread(buf, 1, sizeof buf - 1, e); buf[r]='\0'; fclose(e);
|
||||
fprintf(stderr, "link failed:\n%s\n", buf);
|
||||
}
|
||||
return 1;
|
||||
goto cleanup;
|
||||
}
|
||||
|
||||
char exepath[256];
|
||||
snprintf(exepath, sizeof exepath, "%s/m", dir);
|
||||
int rc = run(exepath);
|
||||
if (WIFEXITED(rc) && WEXITSTATUS(rc) == 7) {
|
||||
printf("arch: ok (only needed archive member pulled)\n");
|
||||
return 0;
|
||||
result = 0;
|
||||
} else {
|
||||
fprintf(stderr, "arch: unexpected exit\n");
|
||||
}
|
||||
fprintf(stderr, "arch: unexpected exit\n");
|
||||
return 1;
|
||||
|
||||
cleanup:
|
||||
snprintf(path, sizeof path, "%s/lib_good.ww", dir); unlink(path);
|
||||
snprintf(path, sizeof path, "%s/lib_bad.ww", dir); unlink(path);
|
||||
snprintf(path, sizeof path, "%s/m.ww", dir); unlink(path);
|
||||
snprintf(path, sizeof path, "%s/lib_good.s", dir); unlink(path);
|
||||
snprintf(path, sizeof path, "%s/lib_bad.s", dir); unlink(path);
|
||||
snprintf(path, sizeof path, "%s/lib_good.o", dir); unlink(path);
|
||||
snprintf(path, sizeof path, "%s/lib_bad.o", dir); unlink(path);
|
||||
snprintf(path, sizeof path, "%s/libfoo.a", dir); unlink(path);
|
||||
snprintf(path, sizeof path, "%s/m.s", dir); unlink(path);
|
||||
snprintf(path, sizeof path, "%s/m.o", dir); unlink(path);
|
||||
snprintf(path, sizeof path, "%s/m", dir); unlink(path);
|
||||
snprintf(path, sizeof path, "%s/link.err", dir); unlink(path);
|
||||
if (rmdir(dir) != 0) {
|
||||
perror(dir);
|
||||
result = 1;
|
||||
}
|
||||
if (result == 0)
|
||||
printf("arch: ok (only needed archive member pulled)\n");
|
||||
return result;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user