diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2013-05-11 16:14:19 -0400 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2013-05-11 16:14:19 -0400 |
| commit | 8cade04c105f2d31c941bee9716a304f93a41351 (patch) | |
| tree | c46564cda34506f8f650065db9cae29517a15624 | |
| parent | 7e2b1c03ce24e8fefa2080c0f1f8cfbb86ce664e (diff) | |
| download | postgresql-8cade04c105f2d31c941bee9716a304f93a41351.tar.gz postgresql-8cade04c105f2d31c941bee9716a304f93a41351.zip | |
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 ...
| -rw-r--r-- | contrib/pg_upgrade/test.sh | 4 |
1 files changed, 4 insertions, 0 deletions
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 |