diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-01-30 02:13:44 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-01-30 02:13:44 +0000 |
| commit | cc03923fcc23e5124d81e3270eec70cb0db5a07d (patch) | |
| tree | 576d30139abb0f4a2a24b24a54f205aa558d0207 | |
| parent | 90e38ab6407bd7237482e01dc4e21da2e4f023e1 (diff) | |
| parent | 307289c20a5c9c9dab0cff0a5c99a71c349e18f2 (diff) | |
| download | nova-cc03923fcc23e5124d81e3270eec70cb0db5a07d.tar.gz nova-cc03923fcc23e5124d81e3270eec70cb0db5a07d.tar.xz nova-cc03923fcc23e5124d81e3270eec70cb0db5a07d.zip | |
Merge "Pass testropts in to setup.py in run_tests.sh"
| -rwxr-xr-x | run_tests.sh | 4 |
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 |