summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wirzenius <liw@liw.fi>2017-04-16 12:46:36 +0300
committerLars Wirzenius <liw@liw.fi>2017-04-16 12:46:36 +0300
commit381e18bf5535b98b583782c38ef1b8d46c647343 (patch)
treee11c949052caa1ce2f5346cae1ccd58cb7f9e66b
parent92d0c5e764665e543c6c70cca3e9b49cbbd0b211 (diff)
downloadcmdtest-381e18bf5535b98b583782c38ef1b8d46c647343.tar.gz
Fix check for whehter we use Python as shell
-rw-r--r--fail-tests/fail.stdout-diff4
-rwxr-xr-xyarn2
2 files changed, 3 insertions, 3 deletions
diff --git a/fail-tests/fail.stdout-diff b/fail-tests/fail.stdout-diff
index 535b0c5..1099531 100644
--- a/fail-tests/fail.stdout-diff
+++ b/fail-tests/fail.stdout-diff
@@ -1,4 +1,4 @@
---- /dev/null 2017-04-10 10:01:11.280543905 +0300
-+++ fail-tests/fail.stdout-actual 2017-04-11 15:19:57.183651499 +0300
+--- /dev/null 2017-04-11 20:10:53.869368051 +0300
++++ fail-tests/fail.stdout-actual 2017-04-16 12:46:26.095515187 +0300
@@ -0,0 +1 @@
+this is not empty output to make test fail
diff --git a/yarn b/yarn
index 3d4865e..d67c115 100755
--- a/yarn
+++ b/yarn
@@ -515,7 +515,7 @@ class YarnRunner(cliapp.Application):
# used. This is a bit of magic that hopefully won't surprise
# users too much.
- if self.settings['shell'] == 'python':
+ if 'python' in self.settings['shell']:
pythonpath = env.get('PYTHONPATH', None)
if pythonpath:
pythonpath += ':' + srcdir