From 3de9f22ace195e9fc1b7208a64290ab5e3404358 Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Mon, 19 Jan 2015 23:44:22 -0500 Subject: [PATCH] In pg_regress, remove the temporary installation upon successful exit. This results in a very substantial reduction in disk space usage during "make check-world", since that sequence involves creation of numerous temporary installations. It should also help a bit in the buildfarm, even though the buildfarm script doesn't create as many temp installations, because the current script misses deleting some of them; and anyway it seems better to do this once in one place rather than expecting that script to get it right every time. In 9.4 and HEAD, also undo the unwise choice in commit b1aebbb6a86e96d7 to report strerror(errno) after a rmtree() failure. rmtree has already reported that, possibly for multiple failures with distinct errnos; and what's more, by the time it returns there is no good reason to assume that errno still reflects the last reportable error. So reporting errno here is at best redundant and at worst badly misleading. Back-patch to all supported branches, so that future revisions of the buildfarm script can rely on this behavior. --- src/test/regress/pg_regress.c | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/src/test/regress/pg_regress.c b/src/test/regress/pg_regress.c index 005cca661f..a2957dc048 100644 --- a/src/test/regress/pg_regress.c +++ b/src/test/regress/pg_regress.c @@ -537,8 +537,8 @@ convert_sourcefiles_in(char *source_subdir, char *dest_dir, char *dest_subdir, c if (directory_exists(testtablespace)) if (!rmtree(testtablespace, true)) { - fprintf(stderr, _("\n%s: could not remove test tablespace \"%s\": %s\n"), - progname, testtablespace, strerror(errno)); + fprintf(stderr, _("\n%s: could not remove test tablespace \"%s\"\n"), + progname, testtablespace); exit(2); } make_directory(testtablespace); @@ -2392,7 +2392,8 @@ regression_main(int argc, char *argv[], init_function ifunc, test_function tfunc header(_("removing existing temp installation")); if (!rmtree(temp_install, true)) { - fprintf(stderr, _("\n%s: could not remove temp installation \"%s\": %s\n"), progname, temp_install, strerror(errno)); + fprintf(stderr, _("\n%s: could not remove temp installation \"%s\"\n"), + progname, temp_install); exit(2); } } @@ -2664,6 +2665,19 @@ regression_main(int argc, char *argv[], init_function ifunc, test_function tfunc stop_postmaster(); } + /* + * If there were no errors, remove the temp installation immediately to + * conserve disk space. (If there were errors, we leave the installation + * in place for possible manual investigation.) + */ + if (temp_install && fail_count == 0 && fail_ignore_count == 0) + { + header(_("removing temporary installation")); + if (!rmtree(temp_install, true)) + fprintf(stderr, _("\n%s: could not remove temp installation \"%s\"\n"), + progname, temp_install); + } + fclose(logfile); /* -- 2.50.1