lib/dirs+lib/os+test: add lib/dirs (XDG paths) + os.mkdirs
Port Hare's lib/dirs (ref/hare/dirs/xdg.ha) — XDG base-directory
lookup with mkdir-on-demand:
dirs.config(prog) — XDG_CONFIG_HOME/<prog>, fallback $HOME/.config/<prog>
dirs.cache(prog) — XDG_CACHE_HOME/<prog>, fallback $HOME/.cache/<prog>
dirs.data(prog) — XDG_DATA_HOME/<prog>, fallback $HOME/.local/share/<prog>
dirs.state(prog) — XDG_STATE_HOME/<prog>, fallback $HOME/.local/state/<prog>
Static-buffer return (256B pathbuf), overwritten on the next dirs.*
call — same contract as lib/temp. Fallback triggers on unset, empty,
or non-absolute XDG var (matches Hare's path::abs check). HOME-unset
rt_aborts (matches Hare's `as str` panic on missing HOME).
os.mkdirs(path, mode) — recursive mkdir, EEXIST-silenced. Walks the
path replacing each '/' with NUL, mkdir'ing each prefix, restoring
the slash. Path bytes must be writable (documented).
Surface skips with reason notes in dirs.ww header:
- runtime() — needs stat+getuid; defer until lib/os has them
- XDG_CONFIG_DIRS / XDG_DATA_DIRS — not in Hare's xdg.ha
- fmt::fatalf-on-mkdir — wired to rt_abort until {n}-placeholder
fmt lands
Cohort coverage in lib/dirs/dirstest.ww + test/wcc/975_dirs_run.c
(mkdtemp-rooted env state): XDG-absolute / XDG-non-absolute fallback /
XDG-unset×2.
This commit is contained in:
84
test/wcc/975_dirs_run.c
Normal file
84
test/wcc/975_dirs_run.c
Normal file
@@ -0,0 +1,84 @@
|
||||
/*
|
||||
* 975_dirs_run — execute the lib/dirs @test fixture under the C-side
|
||||
* `ww run` driver and assert exit 0.
|
||||
*
|
||||
* Workflow:
|
||||
* 1. mkdtemp /tmp/wwdirs-XXXXXX — fresh per run, no cross-run
|
||||
* stale state, no parallel-test conflicts.
|
||||
* 2. setenv the four cohort env states (see lib/dirs/dirstest.ww
|
||||
* file header for the contract).
|
||||
* 3. exec `ww run lib/dirs/dirstest.ww`. The fixture reads
|
||||
* WW_TEST_TMPDIR + the XDG_/HOME envs and asserts.
|
||||
* 4. system("rm -rf <tmpl>") to reclaim the tmpdir + the
|
||||
* auto-created child dirs (dirs.* mkdir-recursive on the way
|
||||
* down, so the directory tree is non-empty by test exit).
|
||||
*
|
||||
* Same wrapper shape as 970-974; cleanup-on-failure is rm-rf'd so a
|
||||
* test failure never leaves residue in /tmp.
|
||||
*/
|
||||
#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;
|
||||
}
|
||||
|
||||
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;
|
||||
|
||||
/* mkdtemp the per-run scratch root. */
|
||||
char tmpl[64];
|
||||
strcpy(tmpl, "/tmp/wwdirs-XXXXXX");
|
||||
if (mkdtemp(tmpl) == NULL) {
|
||||
perror("mkdtemp");
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* Pre-arrange env. The child `ww run` inherits these. */
|
||||
char cfg[128];
|
||||
snprintf(cfg, sizeof cfg, "%s/cfg", tmpl);
|
||||
setenv("HOME", tmpl, 1);
|
||||
setenv("XDG_CONFIG_HOME", cfg, 1);
|
||||
setenv("XDG_CACHE_HOME", "relative/path", 1); /* non-abs → fallback */
|
||||
unsetenv("XDG_DATA_HOME");
|
||||
unsetenv("XDG_STATE_HOME");
|
||||
setenv("WW_TEST_TMPDIR", tmpl, 1);
|
||||
|
||||
const char *src = "lib/dirs/dirstest.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);
|
||||
|
||||
/* Cleanup regardless of pass/fail — no residue under /tmp. */
|
||||
char rmcmd[256];
|
||||
snprintf(rmcmd, sizeof rmcmd, "rm -rf %s", tmpl);
|
||||
(void)system(rmcmd);
|
||||
|
||||
if (rc != 0) {
|
||||
fprintf(stderr, "dirs_run FAIL: %s exited %d\n", src, rc);
|
||||
return 1;
|
||||
}
|
||||
printf("dirs_run: %s ok\n", src);
|
||||
return 0;
|
||||
}
|
||||
Reference in New Issue
Block a user