Skip to content

Commit

Permalink
Specify synapse-directory for integ tests
Browse files Browse the repository at this point in the history
  • Loading branch information
richvdh committed Mar 9, 2016
1 parent 866d0e7 commit 4814e7c
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
4 changes: 3 additions & 1 deletion jenkins-postgres.sh
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,9 @@ git checkout "${GIT_BRANCH}" || (echo >&2 "No ref ${GIT_BRANCH} found, falling b
./jenkins/prep_sytest_for_postgres.sh

echo >&2 "Running sytest with PostgreSQL";
./jenkins/install_and_run.sh --python $TOX_BIN/python --port-base $PORT_BASE
./jenkins/install_and_run.sh --python $TOX_BIN/python \
--synapse-directory $WORKSPACE \
--port-base $PORT_BASE

cd ..
cp sytest/.coverage.* .
Expand Down
4 changes: 3 additions & 1 deletion jenkins-sqlite.sh
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,9 @@ cd sytest
git checkout "${GIT_BRANCH}" || (echo >&2 "No ref ${GIT_BRANCH} found, falling back to develop" ; git checkout develop)

: ${PORT_BASE:=8500}
./jenkins/install_and_run.sh --python $TOX_BIN/python --port-base $PORT_BASE
./jenkins/install_and_run.sh --python $TOX_BIN/python \
--synapse-directory $WORKSPACE \
--port-base $PORT_BASE

cd ..
cp sytest/.coverage.* .
Expand Down

0 comments on commit 4814e7c

Please sign in to comment.