diff options
| author | Erik Johnston <erik@matrix.org> | 2016-01-28 14:46:08 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-01-28 14:46:08 +0000 |
| commit | 19fd4259284598a89036418de62e88a282db9566 (patch) | |
| tree | 2129256c6f81a4274f18c36ccd81173780949c59 /jenkins.sh | |
| parent | Change load limit params (diff) | |
| parent | Merge pull request #534 from matrix-org/erikj/setup (diff) | |
| download | synapse-19fd4259284598a89036418de62e88a282db9566.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/sync
Diffstat (limited to 'jenkins.sh')
| -rwxr-xr-x | jenkins.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/jenkins.sh b/jenkins.sh index e2bb706c7f..804bbd49f1 100755 --- a/jenkins.sh +++ b/jenkins.sh @@ -52,7 +52,7 @@ RUN_POSTGRES="" for port in $(($PORT_BASE + 1)) $(($PORT_BASE + 2)); do if psql synapse_jenkins_$port <<< ""; then - RUN_POSTGRES=$RUN_POSTGRES:$port + RUN_POSTGRES="$RUN_POSTGRES:$port" cat > localhost-$port/database.yaml << EOF name: psycopg2 args: @@ -62,7 +62,7 @@ EOF done # Run if both postgresql databases exist -if test $RUN_POSTGRES = ":$(($PORT_BASE + 1)):$(($PORT_BASE + 2))"; then +if test "$RUN_POSTGRES" = ":$(($PORT_BASE + 1)):$(($PORT_BASE + 2))"; then echo >&2 "Running sytest with PostgreSQL"; $TOX_BIN/pip install psycopg2 ./run-tests.pl --coverage -O tap --synapse-directory $WORKSPACE \ |