diff options
author | holger krekel <holger@merlinux.eu> | 2015-06-19 11:37:08 +0200 |
---|---|---|
committer | holger krekel <holger@merlinux.eu> | 2015-06-19 11:37:08 +0200 |
commit | 519dfc099f43747518187151164f9cfcc1ef09a6 (patch) | |
tree | f26e00d59befd3454fd9b8fd0cd395676f8fe27e /tox/session.py | |
parent | 1d4d3b9433785bf397ef55c3f689a0b48a844c3f (diff) | |
download | tox-519dfc099f43747518187151164f9cfcc1ef09a6.tar.gz |
introduce a TOX_TESTENV_PASSENV setting which is honored
when constructing the set of environment variables for test environments.
Diffstat (limited to 'tox/session.py')
-rw-r--r-- | tox/session.py | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/tox/session.py b/tox/session.py index 37d6b5c..b00465b 100644 --- a/tox/session.py +++ b/tox/session.py @@ -46,6 +46,12 @@ def show_help(config): tw = py.io.TerminalWriter() tw.write(config._parser._format_help()) tw.line() + tw.line("Environment variables", bold=True) + tw.line("TOXENV: comma separated list of environments " + "(overridable by '-e')") + tw.line("TOX_TESTENV_PASSENV: space-separated list of extra " + "environment variables to be passed into test command " + "environemnts") def show_help_ini(config): |