Merge "Pass testropts in to setup.py in run_tests.sh"

This commit is contained in:
Jenkins
2013-01-30 02:13:44 +00:00
committed by Gerrit Code Review

View File

@@ -91,7 +91,7 @@ function run_tests {
# Just run the test suites in current environment # Just run the test suites in current environment
set +e set +e
testrargs=`echo "$testrargs" | sed -e's/^\s*\(.*\)\s*$/\1/'` testrargs=`echo "$testrargs" | sed -e's/^\s*\(.*\)\s*$/\1/'`
TESTRTESTS="$TESTRTESTS --testr-args='$testrargs'" TESTRTESTS="$TESTRTESTS --testr-args='$testropts $testrargs'"
echo "Running \`${wrapper} $TESTRTESTS\`" echo "Running \`${wrapper} $TESTRTESTS\`"
bash -c "${wrapper} $TESTRTESTS" bash -c "${wrapper} $TESTRTESTS"
RESULT=$? RESULT=$?
@@ -155,7 +155,7 @@ function run_pep8 {
} }
TESTRTESTS="python setup.py testr $testropts" TESTRTESTS="python setup.py testr"
if [ $never_venv -eq 0 ] if [ $never_venv -eq 0 ]
then then