Merge pull request #376 from matrix-org/daniel/jenkins

Pull out jenkins script into a checked in script

3 files changed, 9 insertions, 1 deletions

diff --git a/MANIFEST.in b/MANIFEST.in

index 573e21f41d..5668665db7 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -20,4 +20,6 @@ recursive-include synapse/static *.gif
 recursive-include synapse/static *.html
 recursive-include synapse/static *.js
 
+exclude jenkins.sh
+
 prune demo/etc
diff --git a/jenkins.sh b/jenkins.sh
new file mode 100755

index 0000000000..2680d16b42
--- /dev/null
+++ b/jenkins.sh
@@ -0,0 +1,4 @@
+#!/bin/bash -eu
+
+export PYTHONDONTWRITEBYTECODE=yep
+TOXSUFFIX="--reporter=subunit | subunit-1to2 | subunit2junitxml --no-passthrough --output-to=results.xml" tox
diff --git a/tox.ini b/tox.ini

index 01b23e6bd9..cf54ebb0ac 100644
--- a/tox.ini
+++ b/tox.ini
@@ -6,10 +6,12 @@ deps =
     coverage
     Twisted>=15.1
     mock
+    python-subunit
+    junitxml
 setenv =
     PYTHONDONTWRITEBYTECODE = no_byte_code
 commands =
-    coverage run --source=synapse {envbindir}/trial {posargs:tests}
+    /bin/bash -c "coverage run --source=synapse {envbindir}/trial {posargs:tests} {env:TOXSUFFIX:}"
     coverage report -m
 
 [testenv:packaging]