Skip to content

Commit 1681e2f

Browse files
committed
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 b1aebbb 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.
1 parent 19794e9 commit 1681e2f

File tree

1 file changed

+13
-0
lines changed

1 file changed

+13
-0
lines changed

src/test/regress/pg_regress.c

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2672,6 +2672,19 @@ regression_main(int argc, char *argv[], init_function ifunc, test_function tfunc
26722672
stop_postmaster();
26732673
}
26742674

2675+
/*
2676+
* If there were no errors, remove the temp installation immediately to
2677+
* conserve disk space. (If there were errors, we leave the installation
2678+
* in place for possible manual investigation.)
2679+
*/
2680+
if (temp_install && fail_count == 0 && fail_ignore_count == 0)
2681+
{
2682+
header(_("removing temporary installation"));
2683+
if (!rmtree(temp_install, true))
2684+
fprintf(stderr, _("\n%s: could not remove temp installation \"%s\"\n"),
2685+
progname, temp_install);
2686+
}
2687+
26752688
fclose(logfile);
26762689

26772690
/*

0 commit comments

Comments
 (0)