pg_regress: Observe TMPDIR

petere · petere · commit 9cedb1666051 · 2020-03-29T09:25:40.000+02:00
Put the temporary socket directory under TMPDIR, if that environment variable is set, instead of the hardcoded /tmp. This allows running the tests if there is no /tmp at all (for example on Windows, although running the tests with Unix-domain sockets is not enabled on Windows yet). We also use TMPDIR everywhere else /tmp is hardcoded, so this makes the behavior consistent. Reviewed-by: Andrew Dunstan <andrew.dunstan@2ndquadrant.com> Discussion: https://www.postgresql.org/message-id/flat/54bde68c-d134-4eb8-5bd3-8af33b72a010@2ndquadrant.com
diff --git a/src/test/regress/pg_regress.c b/src/test/regress/pg_regress.c
@@ -330,7 +330,8 @@ signal_remove_temp(int signum)
 static const char *
 make_temp_sockdir(void)
 {
-	char	   *template = pg_strdup("/tmp/pg_regress-XXXXXX");
+	char	   *template = psprintf("%s/pg_regress-XXXXXX",
+									getenv("TMPDIR") ? getenv("TMPDIR") : "/tmp");
 
 	temp_sockdir = mkdtemp(template);
 	if (temp_sockdir == NULL)

Original file line number	Diff line number	Diff line change
`@@ -330,7 +330,8 @@ signal_remove_temp(int signum)`
`330`	`330`	`static const char *`
`331`	`331`	`make_temp_sockdir(void)`
`332`	`332`	`{`
`333`		`- char *template = pg_strdup("/tmp/pg_regress-XXXXXX");`
	`333`	`+ char *template = psprintf("%s/pg_regress-XXXXXX",`
	`334`	`+ getenv("TMPDIR") ? getenv("TMPDIR") : "/tmp");`
`334`	`335`
`335`	`336`	`temp_sockdir = mkdtemp(template);`
`336`	`337`	`if (temp_sockdir == NULL)`