From: Peter Eisentraut <peter@eisentraut.org>
Date: Tue, 13 Aug 2019 00:12:54 +0000 (+0200)
Subject: Test against multiple PostgreSQL versions
X-Git-Tag: pgbouncer_1_11_0~6
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=35bffb717b589c321c18c25a4ca4976d14d287a4;p=pgbouncer

Test against multiple PostgreSQL versions

This allows testing versions with older and newer authentication
behavior.
---

diff --git a/.travis.yml b/.travis.yml
index 91b20da..e69c009 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,6 +2,10 @@ dist: xenial
 language: c
 addons:
   apt:
+    sources:
+      - sourceline: 'deb http://apt.postgresql.org/pub/repos/apt/ xenial-pgdg main'
+        key_url: 'https://www.postgresql.org/media/keys/ACCC4CF8.asc'
+    update: true
     packages:
       - debhelper
       - devscripts
@@ -12,14 +16,19 @@ addons:
       - libudns-dev
       - lintian
       - pandoc
+      - postgresql-9.5
+      - postgresql-11
       - python
       - valgrind
 compiler:
   - clang
   - gcc
 env:
+  global:
+    - PGVERSION=11
   matrix:
     - configure_args=''
+    - configure_args='' PGVERSION=9.5
     - configure_args='--disable-evdns --without-cares --without-udns'
     - configure_args='--enable-evdns  --without-cares --without-udns'
     - configure_args='--disable-evdns --with-cares    --without-udns --disable-werror'
@@ -28,10 +37,12 @@ env:
     - configure_args='--with-openssl'
     - configure_args='--without-openssl'
     - use_efence=yes   configure_args='--with-openssl --with-pam'
+    - use_efence=yes   PGVERSION=9.5 configure_args='--with-openssl --with-pam'
     - use_valgrind=yes configure_args='--without-openssl'
+    - use_valgrind=yes PGVERSION=9.5 configure_args='--without-openssl'
 script: |
   set -e
-  PATH=/usr/lib/postgresql/9.5/bin:$PATH
+  PATH=/usr/lib/postgresql/${PGVERSION}/bin:$PATH
   etc/optscan.sh
   ./autogen.sh
   ./configure --prefix=$HOME/install --enable-cassert --enable-werror --without-cares $configure_args
diff --git a/test/ssl/test.sh b/test/ssl/test.sh
index a3e5b34..97d3d3a 100755
--- a/test/ssl/test.sh
+++ b/test/ssl/test.sh
@@ -11,7 +11,6 @@ rm -rf TestCA1
 ./newsite.sh TestCA1 random C=QQ O=Org1 L=computer OU=Dev
 ) > /dev/null
 
-export PATH=/usr/lib/postgresql/9.4/bin:$PATH
 export PGDATA=$PWD/pgdata
 export PGHOST=localhost
 export PGPORT=6667
diff --git a/test/test.sh b/test/test.sh
index 7af9aa5..6b15af7 100755
--- a/test/test.sh
+++ b/test/test.sh
@@ -5,7 +5,6 @@
 
 cd $(dirname $0)
 
-export PATH=/usr/lib/postgresql/9.4/bin:$PATH
 export PGDATA=$PWD/pgdata
 export PGHOST=localhost
 export PGPORT=6667