diff options
| author | Daniele Varrazzo <daniele.varrazzo@gmail.com> | 2017-06-08 18:45:07 +0100 |
|---|---|---|
| committer | Daniele Varrazzo <daniele.varrazzo@gmail.com> | 2017-06-08 18:45:07 +0100 |
| commit | 7d9ef5f952c342f17393c43f9bff368ccf45b5d9 (patch) | |
| tree | 36800de3004befdae5c3f34ba518f3bfea22259c | |
| parent | 767118467fd4fd73c3b8bbaa32824c0881d87f62 (diff) | |
| download | psycopg2-7d9ef5f952c342f17393c43f9bff368ccf45b5d9.tar.gz | |
Run tests against PostgreSQL 10 beta1test-postgres-10beta1
Use the new Postgres verisoning schema: 10 is a major version, 10.0 a
patch release. See
https://wiki.postgresql.org/wiki/New_in_postgres_10#Change_in_Version_Numbering
| -rwxr-xr-x | scripts/travis_prepare.sh | 8 | ||||
| -rwxr-xr-x | scripts/travis_test.sh | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/scripts/travis_prepare.sh b/scripts/travis_prepare.sh index 5af9df9..3743eac 100755 --- a/scripts/travis_prepare.sh +++ b/scripts/travis_prepare.sh @@ -26,9 +26,9 @@ create () { export VERSION=$1 export PACKAGE=${2:-$VERSION} - # Version as number: 9.6 -> 906 - export VERNUM=$(( $(echo $VERSION \ - | sed 's/\(.\+\)\.\(.\+\)/100 * \1 + \2/') )) + # Version as number: 9.6 -> 906; 11 -> 1100 + export VERNUM=$(echo $VERSION \ + | sed 's/\([0-9]\+\)\(\.\([0-9]\+\)\)\?/100 * \1 + 0\3/' | bc) # Port number: 9.6 -> 50906 export PORT=$(( 50000 + $VERNUM )) @@ -127,5 +127,5 @@ fi # Postgres built from master if [[ -n "$TEST_FUTURE" ]]; then - create 10.0 10-master + create 10 10beta1 fi diff --git a/scripts/travis_test.sh b/scripts/travis_test.sh index 5daa9ba..4a4630b 100755 --- a/scripts/travis_test.sh +++ b/scripts/travis_test.sh @@ -23,8 +23,8 @@ run_test () { fi # Port number: 9.6 -> 50906 - port=$(( 50000 + $(echo $VERSION \ - | sed 's/\(.\+\)\.\(.\+\)/100 * \1 + \2/') )) + port=$(echo $VERSION \ + | sed 's/\([0-9]\+\)\(\.\([0-9]\+\)\)\?/50000 + 100 * \1 + 0\3/' | bc) printf "\n\nRunning tests against PostgreSQL $VERSION (port $port)\n\n" export PSYCOPG2_TESTDB=$DBNAME @@ -68,5 +68,5 @@ fi # Postgres built from master if [[ -n "$TEST_FUTURE" ]]; then - run_test 10.0 + run_test 10 fi |