From 3c798ea413dcfc441ca1b84357040e466e9acc35 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Mon, 21 Jun 2021 13:13:41 +1000 Subject: [PATCH] test: force TMPDIR to /tmp if it is unset This way we can rely on it everywhere without having multiple checks for it. --- test/pwtest.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/test/pwtest.c b/test/pwtest.c index 4e85bd455..7a04e91dc 100644 --- a/test/pwtest.c +++ b/test/pwtest.c @@ -521,8 +521,6 @@ static int remove_file(const char *fpath, const struct stat *sb, int typeflag, s int r; /* Safety check: bail out if somehow we left TMPDIR */ - if (!tmpdir) - tmpdir = "/tmp"; spa_assert(spa_strneq(fpath, tmpdir, strlen(tmpdir))); r = remove(fpath); @@ -543,9 +541,6 @@ static void remove_xdg_runtime_dir(const char *xdg_dir) /* Safety checks, we really don't want to recursively remove a * random directory due to a bug */ - if (!tmpdir) - tmpdir = "/tmp"; - spa_assert(spa_strneq(xdg_dir, tmpdir, strlen(tmpdir))); r = spa_scnprintf(path, sizeof(path), "%s/pwtest.dir", xdg_dir); spa_assert((size_t)r == strlen(xdg_dir) + 11); @@ -1264,6 +1259,9 @@ int main(int argc, char **argv) find_suites(ctx, suite_filter); add_tests(ctx); + if (getenv("TMPDIR") == NULL) + setenv("TMPDIR", "/tmp", 1); + ctx->xdg_dir = make_xdg_runtime_dir(); switch (mode) {