build_one_sep (per-package compile + .wwi interfaces + link) becomes the sole build path. do_build/do_run/do_test and the ww twins all route through it; --sep is now an accepted no-op and the run-rejects-sep guard is removed. Deleted the single-file amalgamator, both stages: build_one, expand, expand_dir, peek_package (+ the wwstage twins + strictpkgmismatch). unit_has_package is retained -- the sep scan loop's inline-package check needs it. The sep-shared helpers (enumerate_dir_ww, locate_import*, import_path_form, ImportSet, and ww counterparts) stay; they back the surviving sep path. Restores missing-package enforcement under sep by construction: the sep scan loop loudly rejects an unresolvable import (cannot find package <name>) unless the package is defined inline in the same unit -- matching the deleted amalgamator and closing the silent-accept the flip would otherwise introduce. All 5 wwstage tools relink (each is built via the now-sep `ww build`); emitted asm is byte-identical to the combined build per bootstrap input, so the binary md5 delta is pure link layout, not codegen. selfhost/cmd/ww/main.combined.ww is now stale and unregenerable (its writer build_one is deleted); #90 deletes it next. Test retargets folded in (rule-11 carve-out, #61/#133 precedent): each asserts post-flip-only behavior, is un-pre-migratable unlike #93/#94/#103, and splitting reddens one side. Closes #97. - 989_slttypepref -> dir-package layout (xb imports xa so both same-leaf `invalid` types are in scope at xb.f); inline-multipackage was the amalgamator shape, deleted with the flip. - 989_sepbuild_run -> run --sep now genuinely runs (exit 7), not the old loud-reject (exit 2); + a private per-pid WW_PKGCACHE so the cs/ww per-package byte-id compare on the shared real lib pkgs (rt/time/os) no longer races concurrent siblings on the global out/.pkgcache (the flip made sep the sole path, so every test now contends that cache). - 737_direnum -> the deleted strictpkgmismatch "differs from" wording -> sep's "does not match import path" (shared substring, wwstage terser #68). - 989_lib_byteid -> corpus-completeness scan excludes generated .sepwork scratch (the old `! -name '*.combined.ww'` exclude didn't cover the new sep artifact).
178 lines
5.4 KiB
C
178 lines
5.4 KiB
C
/*
|
|
* 737_direnum — driver-level sentinel for task #22 directory-as-
|
|
* module enumeration. Two row families pinning the contract:
|
|
*
|
|
* ok — multi-file dir is concatenated by both stages; the entry
|
|
* reads cross-pkg bare-leaf fns from sibling files. Build
|
|
* must succeed for both C-built `ww` and ww-built `ww_ww`.
|
|
* bad — multi-file dir with mismatched `package <name>;` decls
|
|
* triggers the strict-same-package error (task #25 subset
|
|
* bundled with #22 because the failure mode is dir-enum's
|
|
* own; cross-stage symmetric).
|
|
*
|
|
* Asm-presence isn't checked separately — 968_utf8_run, 966_strings_
|
|
* run, 995_self_rebuild already exercise dir-enum end-to-end at
|
|
* binary level. This file pins the cstage/wwstage symmetric error
|
|
* path so a regression on either driver fails loud.
|
|
*/
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <unistd.h>
|
|
#include <sys/wait.h>
|
|
|
|
static int
|
|
runwait(const char *cmd)
|
|
{
|
|
int rc = system(cmd);
|
|
if (rc == -1) return -1;
|
|
if (WIFEXITED(rc)) return WEXITSTATUS(rc);
|
|
return 1;
|
|
}
|
|
|
|
static int
|
|
stderr_contains(const char *path, const char *needle)
|
|
{
|
|
FILE *f = fopen(path, "rb");
|
|
if (!f) return 0;
|
|
char buf[4096];
|
|
size_t n = fread(buf, 1, sizeof buf - 1, f);
|
|
fclose(f);
|
|
buf[n] = '\0';
|
|
return strstr(buf, needle) != NULL;
|
|
}
|
|
|
|
int
|
|
main(void)
|
|
{
|
|
const char *bin = getenv("BIN");
|
|
if (!bin) bin = "out/bin";
|
|
char absbin[1024];
|
|
if (bin[0] != '/') {
|
|
char cwd[1024];
|
|
if (getcwd(cwd, sizeof cwd) == NULL) return 1;
|
|
snprintf(absbin, sizeof absbin, "%s/%s", cwd, bin);
|
|
bin = absbin;
|
|
}
|
|
|
|
char ww[1280], ww_ww[1280];
|
|
snprintf(ww, sizeof ww, "%s/ww", bin);
|
|
snprintf(ww_ww, sizeof ww_ww, "%s/ww_ww", bin);
|
|
|
|
int total = 0, fail = 0;
|
|
char errp[64];
|
|
|
|
/* ok: cross-pkg bare-leaf via dir-enum, both stages. */
|
|
{
|
|
const char *src = "test/wcc/data/direnum/entry.ww";
|
|
char tmp[64];
|
|
snprintf(tmp, sizeof tmp, "/tmp/direnum_%d_ok", getpid());
|
|
char cmd[2048];
|
|
|
|
snprintf(cmd, sizeof cmd, "%s run %s >/dev/null 2>&1", ww, src);
|
|
total++;
|
|
if (runwait(cmd) != 0) {
|
|
fprintf(stderr, "737[ok-cstage]: ww run %s failed\n", src);
|
|
fail++;
|
|
}
|
|
|
|
if (access(ww_ww, X_OK) == 0) {
|
|
snprintf(cmd, sizeof cmd, "%s run %s >/dev/null 2>&1",
|
|
ww_ww, src);
|
|
total++;
|
|
if (runwait(cmd) != 0) {
|
|
fprintf(stderr, "737[ok-wwstage]: ww_ww run %s failed\n", src);
|
|
fail++;
|
|
}
|
|
}
|
|
(void)tmp;
|
|
}
|
|
|
|
/* bad: mismatched package decls in same dir → import-path mismatch
|
|
* error. E3-C1: the amalgamator's strict-same-package "differs from"
|
|
* check is deleted; under sep w6c rejects the composed unit with
|
|
* "package <p> does not match import path <i>" (wwstage is terser per
|
|
* #68, so match the shared "does not match import path" substring).
|
|
* Both stages must surface it in stderr. */
|
|
{
|
|
const char *src = "test/wcc/data/direnum/bad_entry.ww";
|
|
snprintf(errp, sizeof errp, "/tmp/direnum_%d_bad.err", getpid());
|
|
|
|
char cmd[2048];
|
|
snprintf(cmd, sizeof cmd, "%s build %s 2>%s >/dev/null",
|
|
ww, src, errp);
|
|
int rc = runwait(cmd);
|
|
total++;
|
|
if (rc == 0) {
|
|
fprintf(stderr, "737[bad-cstage]: expected build failure, succeeded\n");
|
|
fail++;
|
|
} else if (!stderr_contains(errp, "does not match import path")) {
|
|
fprintf(stderr, "737[bad-cstage]: stderr missing 'does not match import path'\n");
|
|
fail++;
|
|
}
|
|
unlink(errp);
|
|
|
|
if (access(ww_ww, X_OK) == 0) {
|
|
snprintf(cmd, sizeof cmd, "%s build %s 2>%s >/dev/null",
|
|
ww_ww, src, errp);
|
|
rc = runwait(cmd);
|
|
total++;
|
|
if (rc == 0) {
|
|
fprintf(stderr, "737[bad-wwstage]: expected build failure, succeeded\n");
|
|
fail++;
|
|
} else if (!stderr_contains(errp, "does not match import path")) {
|
|
fprintf(stderr, "737[bad-wwstage]: stderr missing 'does not match import path'\n");
|
|
fail++;
|
|
}
|
|
unlink(errp);
|
|
}
|
|
}
|
|
|
|
/* bad-deep: same mismatch, but one file's `package` decl sits behind
|
|
* a >2048-byte comment header. Pins the PREP-peek whole-file read
|
|
* (#16): the old 2048-capped peek missed that decl, so the strict-
|
|
* same-package check skipped the file and the mismatch went
|
|
* undetected (build wrongly succeeded); the whole-file peek finds it
|
|
* → "does not match import path". Both stages. (reviewer-batcha pin.) */
|
|
{
|
|
const char *src = "test/wcc/data/direnum/bad_deep_entry.ww";
|
|
snprintf(errp, sizeof errp, "/tmp/direnum_%d_baddeep.err", getpid());
|
|
|
|
char cmd[2048];
|
|
snprintf(cmd, sizeof cmd, "%s build %s 2>%s >/dev/null",
|
|
ww, src, errp);
|
|
int rc = runwait(cmd);
|
|
total++;
|
|
if (rc == 0) {
|
|
fprintf(stderr, "737[bad-deep-cstage]: expected build failure, succeeded\n");
|
|
fail++;
|
|
} else if (!stderr_contains(errp, "does not match import path")) {
|
|
fprintf(stderr, "737[bad-deep-cstage]: stderr missing 'does not match import path'\n");
|
|
fail++;
|
|
}
|
|
unlink(errp);
|
|
|
|
if (access(ww_ww, X_OK) == 0) {
|
|
snprintf(cmd, sizeof cmd, "%s build %s 2>%s >/dev/null",
|
|
ww_ww, src, errp);
|
|
rc = runwait(cmd);
|
|
total++;
|
|
if (rc == 0) {
|
|
fprintf(stderr, "737[bad-deep-wwstage]: expected build failure, succeeded\n");
|
|
fail++;
|
|
} else if (!stderr_contains(errp, "does not match import path")) {
|
|
fprintf(stderr, "737[bad-deep-wwstage]: stderr missing 'does not match import path'\n");
|
|
fail++;
|
|
}
|
|
unlink(errp);
|
|
}
|
|
}
|
|
|
|
if (fail) {
|
|
fprintf(stderr, "737_direnum: %d/%d fixtures failed\n", fail, total);
|
|
return 1;
|
|
}
|
|
printf("737_direnum: %d/%d ok\n", total, total);
|
|
return 0;
|
|
}
|