summaryrefslogtreecommitdiff
path: root/src/tools
diff options
context:
space:
mode:
authorAndrew Dunstan2012-10-02 14:40:57 +0000
committerAndrew Dunstan2012-10-02 14:40:57 +0000
commit06623df63bc7debaad5b3239f2a4626b4c1d8855 (patch)
tree9a8d3e9dc6d2d794f59f99967ca5dd01f7cc4eb2 /src/tools
parent93b6d78cf07cc886cd14edacc7d621ef330c513d (diff)
Allow a few seconds for Windows to catch up with a directory rename when checking pg_upgrade.
Diffstat (limited to 'src/tools')
-rw-r--r--src/tools/msvc/vcregress.pl5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/tools/msvc/vcregress.pl b/src/tools/msvc/vcregress.pl
index b1d02dd2a77..1f95d9f08d6 100644
--- a/src/tools/msvc/vcregress.pl
+++ b/src/tools/msvc/vcregress.pl
@@ -242,7 +242,7 @@ sub upgradecheck
# Much of this comes from the pg_upgrade test.sh script,
# but it only covers the --install case, and not the case
# where the old and new source or bin dirs are different.
- # i.e. only the this version to this version check. That's
+ # i.e. only this version to this version check. That's
# what pg_upgrade's "make check" does.
$ENV{PGPORT} ||= 50432;
@@ -273,6 +273,9 @@ sub upgradecheck
print "\nStopping old cluster\n\n";
system("pg_ctl -m fast stop") == 0 or exit 1;
rename $data, "$data.old";
+ # take a breather in case Windows hasn't quite got
+ # the message about the directory moving
+ sleep(5);
print "\nSetting up new cluster\n\n";
system("initdb") == 0 or exit 1;
print "\nRunning pg_upgrade\n\n";