From: Andrew Dunstan <andrew@dunslane.net>
Date: Sat, 30 Mar 2013 16:54:36 +0000 (-0400)
Subject: Avoid moving data directory in upgrade testing.
X-Git-Tag: REL9_2_4~8
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4e205ec4d9ef0f75ed39e5e8f0cd338d94c154c5;p=postgresql

Avoid moving data directory in upgrade testing.

Windows sometimes gets upset if we rename a large directory and then try
to use the old name quickly, as seen in occasional buildfarm failures.
So we avoid that by building the old version in the intended
destination in the first place instead of renaming it, similar to the
change made for the same reason in commit b7f8465c.
---

diff --git a/contrib/pg_upgrade/test.sh b/contrib/pg_upgrade/test.sh
index 32a11b093b..313701c4f2 100644
--- a/contrib/pg_upgrade/test.sh
+++ b/contrib/pg_upgrade/test.sh
@@ -62,9 +62,10 @@ newsrc=`cd ../.. && pwd`
 PATH=$bindir:$PATH
 export PATH
 
-PGDATA=$temp_root/data
+BASE_PGDATA=$temp_root/data
+PGDATA="$BASE_PGDATA.old"
 export PGDATA
-rm -rf "$PGDATA" "$PGDATA".old
+rm -rf "$BASE_PGDATA" "$PGDATA"
 
 unset PGDATABASE
 unset PGUSER
@@ -120,7 +121,7 @@ if [ -n "$pg_dumpall1_status" ]; then
 	exit 1
 fi
 
-mv "${PGDATA}" "${PGDATA}.old"
+PGDATA=$BASE_PGDATA
 
 initdb