diff options
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/msvc/vcregress.pl | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/src/tools/msvc/vcregress.pl b/src/tools/msvc/vcregress.pl index 3365ee578c3..d6763ad4ac5 100644 --- 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 |