diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-12-22 20:52:06 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-12-22 20:52:06 +0000 |
| commit | 59c674363b41cfbf4d2e850e51a822ef00b41e22 (patch) | |
| tree | 7af791ceb3f26a81e54f359d6835c830e2142b36 | |
| parent | a0b8d9757472cc900746c891c20cd7290b55eccb (diff) | |
| parent | 0323a744e6fcb2890afb2350b210e34753615d61 (diff) | |
Merge "allow for the ability to run partial coverage"
| -rwxr-xr-x | run_tests.sh | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/run_tests.sh b/run_tests.sh index 014837e32..a3ed97803 100755 --- a/run_tests.sh +++ b/run_tests.sh @@ -82,11 +82,14 @@ function run_tests { if [ $coverage -eq 1 ]; then # Do not test test_coverage_ext when gathering coverage. - TESTRTESTS="$TESTRTESTS ^(?!.*test_coverage_ext).*$" + if [ "x$testrargs" = "x" ]; then + testrargs = "^(?!.*test_coverage_ext).*$" + fi export PYTHON="${wrapper} coverage run --source nova --parallel-mode" fi # Just run the test suites in current environment set +e + TESTRTESTS="$TESTRTESTS $testrargs" echo "Running \`${wrapper} $TESTRTESTS\`" ${wrapper} $TESTRTESTS RESULT=$? @@ -130,7 +133,7 @@ function run_pep8 { } -TESTRTESTS="testr run --parallel $testropts $testrargs" +TESTRTESTS="testr run --parallel $testropts" if [ $never_venv -eq 0 ] then |