summaryrefslogtreecommitdiffstats
path: root/run_tests.sh
diff options
context:
space:
mode:
authorDaniel P. Berrange <berrange@redhat.com>2013-02-11 15:58:47 +0000
committerDaniel P. Berrange <berrange@redhat.com>2013-02-11 16:01:01 +0000
commit3e4637e8e7887567ac7dbc60e997aa780f029c1c (patch)
tree85a18a94d723ebe7e3de6761b490a811a03a0f06 /run_tests.sh
parentf262c435f4785ee18d7c3609767e5344915001b9 (diff)
downloadnova-3e4637e8e7887567ac7dbc60e997aa780f029c1c.tar.gz
nova-3e4637e8e7887567ac7dbc60e997aa780f029c1c.tar.xz
nova-3e4637e8e7887567ac7dbc60e997aa780f029c1c.zip
Ensure 'subunit2pyunit' is run in venv from run_tests.sh
The run_tests.sh script invokes bash -c "${wrapper} $TESTRTESTS | subunit2pyunit" where '${wrapper}' expands to 'tools/with_venv.sh'. Due to shell precedence rules, this only applies to '$TESTRTESTS' not the 'subunit2pyunit' part of the command. The 'subunit2pyunit' binary though may only be available from the .venv Change-Id: I5972c8f77b3f50a3713881e6ca1acbaeabbd47d4 Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Diffstat (limited to 'run_tests.sh')
-rwxr-xr-xrun_tests.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/run_tests.sh b/run_tests.sh
index 05e762aaf..ec67207e4 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -93,7 +93,7 @@ function run_tests {
testrargs=`echo "$testrargs" | sed -e's/^\s*\(.*\)\s*$/\1/'`
TESTRTESTS="$TESTRTESTS --testr-args='--subunit $testropts $testrargs'"
echo "Running \`${wrapper} $TESTRTESTS\`"
- bash -c "${wrapper} $TESTRTESTS | subunit2pyunit"
+ bash -c "${wrapper} $TESTRTESTS | ${wrapper} subunit2pyunit"
RESULT=$?
set -e