Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Commit

Permalink
Use an absolute path when specifying the directory for synapse in jen…
Browse files Browse the repository at this point in the history
…kins.sh
  • Loading branch information
Mark Haines committed Dec 21, 2015
1 parent 64b6606 commit 9036d2d
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions jenkins.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,7 @@ tox

: ${GIT_BRANCH:="origin/$(git rev-parse --abbrev-ref HEAD)"}

set +u
. .tox/py27/bin/activate
set -u
TOX_BIN=$WORKSPACE/.tox/py27/bin

if [[ ! -e .sytest-base ]]; then
git clone https://github.com/matrix-org/sytest.git .sytest-base --mirror
Expand All @@ -48,7 +46,8 @@ export PERL5LIB PERL_MB_OPT PERL_MM_OPT
: ${PORT_BASE:=8000}

echo >&2 "Running sytest with SQLite3";
./run-tests.pl --coverage -O tap --synapse-directory .. --all --port-base $PORT_BASE > results-sqlite3.tap
./run-tests.pl --coverage -O tap --synapse-directory $WORKSPACE \
--python $TOX_BIN/python --all --port-base $PORT_BASE > results-sqlite3.tap

RUN_POSTGRES=""

Expand All @@ -66,8 +65,9 @@ done
# Run if both postgresql databases exist
if test $RUN_POSTGRES = ":$(($PORT_BASE + 1)):$(($PORT_BASE + 2))"; then
echo >&2 "Running sytest with PostgreSQL";
pip install psycopg2
./run-tests.pl --coverage -O tap --synapse-directory .. --all --port-base $PORT_BASE > results-postgresql.tap
$TOX_BIN/pip install psycopg2
./run-tests.pl --coverage -O tap --synapse-directory $WORKSPACE \
--python $TOX_BIN/python --all --port-base $PORT_BASE > results-postgresql.tap
else
echo >&2 "Skipping running sytest with PostgreSQL, $RUN_POSTGRES"
fi
Expand All @@ -76,6 +76,6 @@ cd ..
cp sytest/.coverage.* .

# Combine the coverage reports
python -m coverage combine
$TOX_BIN/python -m coverage combine
# Output coverage to coverage.xml
coverage xml -o coverage.xml
$TOX_BIN/coverage xml -o coverage.xml

0 comments on commit 9036d2d

Please sign in to comment.