Skip to content

Commit a0e73c9

Browse files
committed
make run_tests use the SHELL var to run test script
Change-Id: I108147219be7d5c869a7455d805f89c0343d9646
1 parent bde7ba8 commit a0e73c9

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

tests/run_tests

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ do
4949

5050
echo
5151
echo '********************************************************************************'
52-
echo "Running $test_script"
52+
echo "Running $SHELL $test_shell_opts $test_script"
5353
echo " VIRTUAL_ENV=$VIRTUAL_ENV"
5454
echo " VIRTUALENVWRAPPER_PYTHON=$VIRTUALENVWRAPPER_PYTHON"
5555
echo " $($VIRTUALENVWRAPPER_PYTHON -V 2>&1)"
@@ -59,12 +59,14 @@ do
5959
echo " ZSH_VERSION=$ZSH_VERSION"
6060
echo " KSH_VERSION=$KSH_VERSION"
6161
echo " virtualenv=$(which virtualenv)"
62+
echo " test_shell_opts=$test_shell_opts"
6263
echo " ZSH=$ZSH_NAME $ZSH_EVAL_CONTEXT"
6364
echo " TMPDIR=$TMPDIR"
65+
6466
echo
6567
SHUNIT_PARENT="$test_script"
6668
export SHUNIT_PARENT
67-
$test_shell_opts $test_script || exit 1
69+
$SHELL $test_shell_opts $test_script || exit 1
6870
echo
6971

7072
done

tox.ini

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ commands = bash ./tests/run_tests {envdir} []
4444
basepython=python2.7
4545
setenv =
4646
SHELL = /bin/zsh
47+
test_shell_opts = -o shwordsplit
4748
commands = zsh -o shwordsplit ./tests/run_tests {envdir} []
4849

4950
[testenv:ksh]

0 commit comments

Comments
 (0)