database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-28 23:42:10 +03:00
Code Activity

Fix location of output logs of pg_regress

Browse Source 
initdb.log and postmaster.log were moved to within the temporary instance
path by commit dcae5fa. This directory now gets removed at the end
of the run of pg_regress when there are no failures found, which makes
analysis of after-run issues difficult in some cases, and reduces the
output verbosity of the buildfarm after a run.

Fix by Michael Paquier

Backpatch to 9.5
This commit is contained in:
Andrew Dunstan
2015-07-21 09:53:16 -04:00
parent 149b1dd840
commit 9faa6ae14f
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/test/regress/pg_regress.c
View File

@ -2207,7 +2207,7 @@ regression_main(int argc, char *argv[], init_function ifunc, test_function tfunc
make_directory(temp_instance); make_directory(temp_instance);
/* and a directory for log files */ /* and a directory for log files */
snprintf(buf, sizeof(buf), "%s/log", temp_instance); snprintf(buf, sizeof(buf), "%s/log", outputdir);
if (!directory_exists(buf)) if (!directory_exists(buf))
make_directory(buf); make_directory(buf);
@ -2220,10 +2220,10 @@ regression_main(int argc, char *argv[], init_function ifunc, test_function tfunc
temp_instance, temp_instance,
debug ? " --debug" : "", debug ? " --debug" : "",
nolocale ? " --no-locale" : "", nolocale ? " --no-locale" : "",
temp_instance); outputdir);
if (system(buf)) if (system(buf))
{ {
fprintf(stderr, _("\n%s: initdb failed\nExamine %s/log/initdb.log for the reason.\nCommand was: %s\n"), progname, temp_instance, buf); fprintf(stderr, _("\n%s: initdb failed\nExamine %s/log/initdb.log for the reason.\nCommand was: %s\n"), progname, outputdir, buf);
exit(2); exit(2);
} }
@ -2324,7 +2324,7 @@ regression_main(int argc, char *argv[], init_function ifunc, test_function tfunc
bindir ? "/" : "", bindir ? "/" : "",
temp_instance, debug ? " -d 5" : "", temp_instance, debug ? " -d 5" : "",
hostname ? hostname : "", sockdir ? sockdir : "", hostname ? hostname : "", sockdir ? sockdir : "",
temp_instance); outputdir);
postmaster_pid = spawn_process(buf); postmaster_pid = spawn_process(buf);
if (postmaster_pid == INVALID_PID) if (postmaster_pid == INVALID_PID)
{ {
@ -2353,7 +2353,7 @@ regression_main(int argc, char *argv[], init_function ifunc, test_function tfunc
if (WaitForSingleObject(postmaster_pid, 0) == WAIT_OBJECT_0) if (WaitForSingleObject(postmaster_pid, 0) == WAIT_OBJECT_0)
#endif #endif
{ {
fprintf(stderr, _("\n%s: postmaster failed\nExamine %s/log/postmaster.log for the reason\n"), progname, temp_instance); fprintf(stderr, _("\n%s: postmaster failed\nExamine %s/log/postmaster.log for the reason\n"), progname, outputdir);
exit(2); exit(2);
} }
@ -2361,7 +2361,7 @@ regression_main(int argc, char *argv[], init_function ifunc, test_function tfunc
} }
if (i >= 60) if (i >= 60)
{ {
fprintf(stderr, _("\n%s: postmaster did not respond within 60 seconds\nExamine %s/log/postmaster.log for the reason\n"), progname, temp_instance); fprintf(stderr, _("\n%s: postmaster did not respond within 60 seconds\nExamine %s/log/postmaster.log for the reason\n"), progname, outputdir);
/* /*
* If we get here, the postmaster is probably wedged somewhere in * If we get here, the postmaster is probably wedged somewhere in