diff --git a/run_tests.sh b/run_tests.sh index 5bb2842b270e..3bf996fa26a5 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