From 2cd88f1707408759b5079271c0d72e87b1cba301 Mon Sep 17 00:00:00 2001 From: Hojun-Cho Date: Fri, 15 May 2026 00:26:10 +0900 Subject: [PATCH] test: wire lib/memio/memiotest.ww into make test memiotest.ww existed and passed under `out/bin/ww run` but no test/wcc/*.c ran it under `make test`. New 980_memio_run runs it and propagates exit; matches the 998_bufio_run pattern. 980-989 is the new sub-band for stdlib-run integration tests. --- Makefile | 6 ++++- test/wcc/980_memio_run.c | 51 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+), 1 deletion(-) create mode 100644 test/wcc/980_memio_run.c diff --git a/Makefile b/Makefile index b26cffb8..4ee885c0 100644 --- a/Makefile +++ b/Makefile @@ -225,7 +225,7 @@ TESTS = $(BIN)/test_smoke $(BIN)/test_lex $(BIN)/test_parse $(BIN)/test_check \ $(BIN)/test_selfhost $(BIN)/test_w6a_ww $(BIN)/test_w6l_ww \ $(BIN)/test_w6c_ww $(BIN)/test_ww_ww $(BIN)/test_self_rebuild \ $(BIN)/test_dyn_ww $(BIN)/test_selfcheck $(BIN)/test_at_test_ww \ - $(BIN)/test_bufio_run + $(BIN)/test_memio_run $(BIN)/test_bufio_run $(BIN)/test_smoke: test/wcc/000_smoke.c $(LIB)/libwcc.a | $(BIN) $(CC) $(CFLAGS) $(INCS) -o $@ $< -L$(LIB) -lwcc @@ -371,6 +371,10 @@ $(BIN)/test_at_test_ww: test/wcc/997_at_test_ww.c $(BIN)/ww_ww $(BIN)/w6c_ww \ $(BIN)/w6a_ww $(BIN)/w6l_ww $(LIB)/libwwrt.a | $(BIN) $(CC) $(CFLAGS) -o $@ $< +$(BIN)/test_memio_run: test/wcc/980_memio_run.c $(BIN)/ww $(BIN)/w6c \ + $(BIN)/w6a $(BIN)/w6l $(LIB)/libwwrt.a | $(BIN) + $(CC) $(CFLAGS) -o $@ $< + $(BIN)/test_bufio_run: test/wcc/998_bufio_run.c $(BIN)/ww $(BIN)/w6c \ $(BIN)/w6a $(BIN)/w6l $(LIB)/libwwrt.a | $(BIN) $(CC) $(CFLAGS) -o $@ $< diff --git a/test/wcc/980_memio_run.c b/test/wcc/980_memio_run.c new file mode 100644 index 00000000..eaa5caf0 --- /dev/null +++ b/test/wcc/980_memio_run.c @@ -0,0 +1,51 @@ +/* + * 980_memio_run — execute the lib/memio @test fixture under the + * C-side `ww run` driver and assert exit 0. + * + * Companion to 998_bufio_run; first entry in the 980-989 stdlib-run + * sub-band. memiotest.ww carries its own `export fn main()` that + * drives the @test fns and signals which case failed via the exit + * code, so this file is just a thin wrapper — no @test scanning, + * no synthetic main generation. + */ +#include +#include +#include +#include + +static int +runwait(const char *cmd) +{ + int rc = system(cmd); + if (rc == -1) return -1; + if (WIFEXITED(rc)) return WEXITSTATUS(rc); + return 1; +} + +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 cwd[1024]; + if (getcwd(cwd, sizeof cwd) == NULL) return 1; + + const char *src = "lib/memio/memiotest.ww"; + char path[1024], cmd[2048]; + snprintf(path, sizeof path, "%s/%s", cwd, src); + snprintf(cmd, sizeof cmd, "%s/ww run %s", bin, path); + int rc = runwait(cmd); + if (rc != 0) { + fprintf(stderr, "memio_run FAIL: %s exited %d\n", src, rc); + return 1; + } + printf("memio_run: %s ok\n", src); + return 0; +}