diff options
Diffstat (limited to 'src/tools/msvc/vcregress.pl')
| -rw-r--r-- | src/tools/msvc/vcregress.pl | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/tools/msvc/vcregress.pl b/src/tools/msvc/vcregress.pl index cdba9a5fb71..89bd31a306c 100644 --- a/src/tools/msvc/vcregress.pl +++ b/src/tools/msvc/vcregress.pl @@ -31,7 +31,8 @@ if (-e "src/tools/msvc/buildenv.pl") my $what = shift || ""; if ($what =~ - /^(check|installcheck|plcheck|contribcheck|ecpgcheck|isolationcheck|upgradecheck)$/i) +/^(check|installcheck|plcheck|contribcheck|ecpgcheck|isolationcheck|upgradecheck)$/i + ) { $what = uc $what; } @@ -76,7 +77,7 @@ my %command = ( ECPGCHECK => \&ecpgcheck, CONTRIBCHECK => \&contribcheck, ISOLATIONCHECK => \&isolationcheck, - UPGRADECHECK => \&upgradecheck,); + UPGRADECHECK => \&upgradecheck,); my $proc = $command{$what}; @@ -251,9 +252,10 @@ sub upgradecheck my $tmp_install = "$tmp_root/install"; print "Setting up temp install\n\n"; Install($tmp_install, $config); + # Install does a chdir, so change back after that chdir $cwd; - my ($bindir,$libdir,$oldsrc,$newsrc) = + my ($bindir, $libdir, $oldsrc, $newsrc) = ("$tmp_install/bin", "$tmp_install/lib", $topdir, $topdir); $ENV{PATH} = "$bindir;$ENV{PATH}"; my $data = "$tmp_root/data"; @@ -266,6 +268,7 @@ sub upgradecheck system("pg_ctl start -l $logdir/postmaster1.log -w") == 0 or exit 1; print "\nSetting up data for upgrading\n\n"; installcheck(); + # now we can chdir into the source dir chdir "$topdir/contrib/pg_upgrade"; print "\nDumping old cluster\n\n"; @@ -276,7 +279,7 @@ sub upgradecheck print "\nSetting up new cluster\n\n"; system("initdb") == 0 or exit 1; print "\nRunning pg_upgrade\n\n"; - system("pg_upgrade -d $data.old -D $data -b $bindir -B $bindir") == 0 + system("pg_upgrade -d $data.old -D $data -b $bindir -B $bindir") == 0 or exit 1; print "\nStarting new cluster\n\n"; system("pg_ctl -l $logdir/postmaster2.log -w start") == 0 or exit 1; |