From cf3c0431c387a72fdbc66ec78086f695d0b6de3c Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Tue, 26 Oct 2021 11:14:06 +1000 Subject: [PATCH] test: fix tmpdir value after setenv Introduced in a2856c6e0f692b7a379e06d3ed6ac8107f9b946b set_test_env() modifies TMPDIR so we must not use getenv until after that call. Fixes #1736 --- test/pwtest.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/pwtest.c b/test/pwtest.c index fbf16cb2f..a000153fd 100644 --- a/test/pwtest.c +++ b/test/pwtest.c @@ -915,9 +915,7 @@ static void run_test(struct pwtest_context *ctx, struct pwtest_suite *c, struct pid_t pw_daemon = 0; int read_fds[_FD_LAST], write_fds[_FD_LAST]; int r; - const char *tmpdir = getenv("TMPDIR"); - - spa_assert_se(tmpdir != NULL); + const char *tmpdir; if (t->result == PWTEST_SKIP) { char *buf = pw_array_add(&t->logs[FD_LOG], 64); @@ -934,6 +932,8 @@ static void run_test(struct pwtest_context *ctx, struct pwtest_suite *c, struct } set_test_env(ctx, t); + tmpdir = getenv("TMPDIR"); + spa_assert_se(tmpdir != NULL); r = chdir(tmpdir); if (r < 0) { t->sig_or_errno = -errno;