summaryrefslogtreecommitdiffstats
path: root/run_tests.sh
diff options
context:
space:
mode:
authorMonty Taylor <mordred@inaugust.com>2013-01-30 11:43:43 +1100
committerMonty Taylor <mordred@inaugust.com>2013-01-30 11:43:43 +1100
commit307289c20a5c9c9dab0cff0a5c99a71c349e18f2 (patch)
tree292fe8007cfdfff7b1e61d6648727381b766439e /run_tests.sh
parentf211597f02c62d67adb8a87f85a934c012926e18 (diff)
downloadnova-307289c20a5c9c9dab0cff0a5c99a71c349e18f2.tar.gz
nova-307289c20a5c9c9dab0cff0a5c99a71c349e18f2.tar.xz
nova-307289c20a5c9c9dab0cff0a5c99a71c349e18f2.zip
Pass testropts in to setup.py in run_tests.sh
Change-Id: Idba469fbd8c0488a308071de45e16eedcb1d6cc6
Diffstat (limited to 'run_tests.sh')
-rwxr-xr-xrun_tests.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/run_tests.sh b/run_tests.sh
index 5bb2842b2..3bf996fa2 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -91,7 +91,7 @@ function run_tests {
# Just run the test suites in current environment
set +e
testrargs=`echo "$testrargs" | sed -e's/^\s*\(.*\)\s*$/\1/'`
- TESTRTESTS="$TESTRTESTS --testr-args='$testrargs'"
+ TESTRTESTS="$TESTRTESTS --testr-args='$testropts $testrargs'"
echo "Running \`${wrapper} $TESTRTESTS\`"
bash -c "${wrapper} $TESTRTESTS"
RESULT=$?
@@ -155,7 +155,7 @@ function run_pep8 {
}
-TESTRTESTS="python setup.py testr $testropts"
+TESTRTESTS="python setup.py testr"
if [ $never_venv -eq 0 ]
then