Remove reset of testtablespace from pg_regress on Windows

testtablespace is an extra path used as tablespace location in the main
regression test suite, computed from --outputdir as defined by the
caller of pg_regress (current directory if undefined).

This special handling was introduced as of f10589e to be specific to
MSVC, as we let pg_regress' Makefile handle this cleanup in other
environments.  This moves the cleanup to the MSVC script running
regression tests instead where needed: check, installcheck and
upgradecheck.  I have also checked this patch on MSVC with repeated runs
of each target.

Author: Kyotaro Horiguchi, Michael Paquier
Discussion: https://postgr.es/m/20200219.142519.437573253063431435.horikyota.ntt@gmail.com

diff --git a/src/test/regress/pg_regress.c b/src/test/regress/pg_regress.c
index f11a3b9e26e621d1291df74bd1c08ed05cc17a4f..c8d190d2489ff19d6e147b9ac4ba58e0d3c13901 100644 (file)
--- a/src/test/regress/pg_regress.c
+++ b/src/test/regress/pg_regress.c
@@ -494,28 +494,6 @@ convert_sourcefiles_in(const char *source_subdir, const char *dest_dir, const ch
 
        snprintf(testtablespace, MAXPGPATH, "%s/testtablespace", outputdir);
 
-#ifdef WIN32
-
-       /*
-        * On Windows only, clean out the test tablespace dir, or create it if it
-        * doesn't exist.  On other platforms we expect the Makefile to take care
-        * of that.  (We don't migrate that functionality in here because it'd be
-        * harder to cope with platform-specific issues such as SELinux.)
-        *
-        * XXX it would be better if pg_regress.c had nothing at all to do with
-        * testtablespace, and this were handled by a .BAT file or similar on
-        * Windows.  See pgsql-hackers discussion of 2008-01-18.
-        */
-       if (directory_exists(testtablespace))
-               if (!rmtree(testtablespace, true))
-               {
-                       fprintf(stderr, _("\n%s: could not remove test tablespace \"%s\"\n"),
-                                       progname, testtablespace);
-                       exit(2);
-               }
-       make_directory(testtablespace);
-#endif
-
        /* finally loop on each file and do the replacement */
        for (name = names; *name; name++)
        {

diff --git a/src/tools/msvc/vcregress.pl b/src/tools/msvc/vcregress.pl
index 3365ee578c3dbd1d717c42ba47348d9a1b702724..d6763ad4ac57b2c55d5bec4915851d985ada16d5 100644 (file)
--- a/src/tools/msvc/vcregress.pl
+++ b/src/tools/msvc/vcregress.pl
@@ -123,6 +123,8 @@ sub installcheck_internal
 sub installcheck
 {
        my $schedule = shift || 'serial';
+
+       CleanupTablespaceDirectory();
        installcheck_internal($schedule);
        return;
 }
@@ -143,6 +145,7 @@ sub check
                "--temp-instance=./tmp_check");
        push(@args, $maxconn)     if $maxconn;
        push(@args, $temp_config) if $temp_config;
+       CleanupTablespaceDirectory();
        system(@args);
        my $status = $? >> 8;
        exit $status if $status;
@@ -570,8 +573,8 @@ sub upgradecheck
        $ENV{PGDATA} = "$data.old";
        my $outputdir          = "$tmp_root/regress";
        my @EXTRA_REGRESS_OPTS = ("--outputdir=$outputdir");
-       mkdir "$outputdir"                || die $!;
-       mkdir "$outputdir/testtablespace" || die $!;
+       mkdir "$outputdir" || die $!;
+       CleanupTablespaceDirectory($outputdir);
 
        my $logdir = "$topdir/src/bin/pg_upgrade/log";
        rmtree($logdir);
@@ -737,6 +740,16 @@ sub InstallTemp
        return;
 }
 
+sub CleanupTablespaceDirectory
+{
+       my $testdir = shift || getcwd();
+
+       my $testtablespace = "$testdir/testtablespace";
+
+       rmtree($testtablespace) if (-d $testtablespace);
+       mkdir($testtablespace);
+}
+
 sub usage
 {
        print STDERR