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 ...

diff --git a/contrib/pg_upgrade/test.sh b/contrib/pg_upgrade/test.sh
index 8bc6a00b538746f6bb761d3706e9f684e2f58f48..e1db3761558e534a89aad92592bc2bd8b2f4086c 100644 (file)
--- 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