From 233af7c74bff9815a282bdd43d9979b081189544 Mon Sep 17 00:00:00 2001
From: Daniel Wagner-Hall <daniel@matrix.org>
Date: Fri, 13 Nov 2015 16:22:51 +0000
Subject: [PATCH] Pull out jenkins script into a checked in script

---
 MANIFEST.in | 2 ++
 jenkins.sh  | 4 ++++
 tox.ini     | 4 +++-
 3 files changed, 9 insertions(+), 1 deletion(-)
 create mode 100755 jenkins.sh

diff --git a/MANIFEST.in b/MANIFEST.in
index 573e21f41..5668665db 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 000000000..2680d16b4
--- /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 01b23e6bd..cf54ebb0a 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]