summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erikj@jki.re>2016-06-10 13:02:48 +0100
committerGitHub <noreply@github.com>2016-06-10 13:02:48 +0100
commite9892b4b2681d961c486daeda52457d881054f2f (patch)
tree829dd38b3f07c0b1b742ba1a1810fd1731711566
parentMerge pull request #863 from matrix-org/markjh/load_config (diff)
parentChange /bin/bash to /bin/sh in tox.ini (diff)
downloadsynapse-e9892b4b2681d961c486daeda52457d881054f2f.tar.xz
Merge pull request #866 from bartekrutkowski/develop
Change /bin/bash to /bin/sh in tox.ini
-rw-r--r--tox.ini4
1 files changed, 2 insertions, 2 deletions
diff --git a/tox.ini b/tox.ini

index 757b7189c3..52d93c65e5 100644 --- a/tox.ini +++ b/tox.ini
@@ -11,7 +11,7 @@ deps = setenv = PYTHONDONTWRITEBYTECODE = no_byte_code commands = - /bin/bash -c "find {toxinidir} -name '*.pyc' -delete ; coverage run {env:COVERAGE_OPTS:} --source={toxinidir}/synapse \ + /bin/sh -c "find {toxinidir} -name '*.pyc' -delete ; coverage run {env:COVERAGE_OPTS:} --source={toxinidir}/synapse \ {envbindir}/trial {env:TRIAL_FLAGS:} {posargs:tests} {env:TOXSUFFIX:}" {env:DUMP_COVERAGE_COMMAND:coverage report -m} @@ -26,4 +26,4 @@ skip_install = True basepython = python2.7 deps = flake8 -commands = /bin/bash -c "flake8 synapse tests {env:PEP8SUFFIX:}" +commands = /bin/sh -c "flake8 synapse tests {env:PEP8SUFFIX:}"