diff options
author | David Baker <dave@matrix.org> | 2016-08-16 16:46:37 +0100 |
---|---|---|
committer | David Baker <dave@matrix.org> | 2016-08-16 16:46:37 +0100 |
commit | 0bba2799b6eeaf95b52ba9c4f2831def37d8effd (patch) | |
tree | f4da51c1d29e54bfa06c4935a188245592a99a90 /jenkins-unittests.sh | |
parent | s/underride/override/ in the rule_id too (diff) | |
parent | Merge pull request #1015 from matrix-org/erikj/preview_url_fixes (diff) | |
download | synapse-0bba2799b6eeaf95b52ba9c4f2831def37d8effd.tar.xz |
Merge remote-tracking branch 'origin/develop' into dbkr/contains_display_name_override
Diffstat (limited to 'jenkins-unittests.sh')
-rwxr-xr-x | jenkins-unittests.sh | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/jenkins-unittests.sh b/jenkins-unittests.sh index 6b0c296cff..4c2f103e80 100755 --- a/jenkins-unittests.sh +++ b/jenkins-unittests.sh @@ -25,5 +25,6 @@ rm .coverage* || echo "No coverage files to remove" tox --notest -e py27 TOX_BIN=$WORKSPACE/.tox/py27/bin python synapse/python_dependencies.py | xargs -n1 $TOX_BIN/pip install +$TOX_BIN/pip install lxml tox -e py27 |