From 8cade04c105f2d31c941bee9716a304f93a41351 Mon Sep 17 00:00:00 2001
From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Sat, 11 May 2013 16:14:19 -0400
Subject: [PATCH] Fix buildfarm incompatibility in updated pg_upgrade test
 script.

Looks like some versions of the buildfarm script try to set the port via
--port in $EXTRA_REGRESS_OPTS.  Override that ...
---
 contrib/pg_upgrade/test.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/contrib/pg_upgrade/test.sh b/contrib/pg_upgrade/test.sh
index 8bc6a00b538..e1db3761558 100644
--- a/contrib/pg_upgrade/test.sh
+++ b/contrib/pg_upgrade/test.sh
@@ -103,6 +103,10 @@ do
 	export PGPORT
 done
 
+# buildfarm may try to override port via EXTRA_REGRESS_OPTS ...
+EXTRA_REGRESS_OPTS="$EXTRA_REGRESS_OPTS --port=$PGPORT"
+export EXTRA_REGRESS_OPTS
+
 # enable echo so the user can see what is being executed
 set -x