diff options
| author | Daniel Wagner-Hall <dawagner@gmail.com> | 2015-11-16 12:50:26 -0500 |
|---|---|---|
| committer | Daniel Wagner-Hall <dawagner@gmail.com> | 2015-11-16 12:50:26 -0500 |
| commit | 3b90df21d515e2f291762d783375a3489d4dd99c (patch) | |
| tree | 73b92f3881e1d349d167170f796111c9b7ec236f | |
| parent | Merge pull request #377 from matrix-org/paul/tiny-fixes (diff) | |
| parent | Pull out jenkins script into a checked in script (diff) | |
| download | synapse-3b90df21d515e2f291762d783375a3489d4dd99c.tar.xz | |
Merge pull request #376 from matrix-org/daniel/jenkins
Pull out jenkins script into a checked in script
| -rw-r--r-- | MANIFEST.in | 2 | ||||
| -rwxr-xr-x | jenkins.sh | 4 | ||||
| -rw-r--r-- | tox.ini | 4 |
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] |