X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=run_tests.sh;h=b3cbfb12747bab4ce1edf0f324df525aebb72bb6;hb=bcbea9565b14bae34706d7ca20257ec2b41985e1;hp=50ccb04c6196c218967c8040c6f95f24bbf679b7;hpb=4d36bbf0990fc6ddb59092dd8bd7f985392907cb;p=yardstick.git diff --git a/run_tests.sh b/run_tests.sh index 50ccb04c6..b3cbfb127 100755 --- a/run_tests.sh +++ b/run_tests.sh @@ -16,6 +16,12 @@ getopts ":f" FILE_OPTION # don't write .pyc files this can cause odd unittest results export PYTHONDONTWRITEBYTECODE=1 +PY_VER="py$( python --version | sed 's/[^[:digit:]]//g' | cut -c-2 )" +export PY_VER + +COVER_DIR_NAME="./tests/ci/" +export COVER_DIR_NAME + run_flake8() { echo "Running flake8 ... " logfile=test_results.log @@ -60,8 +66,11 @@ run_tests() { } run_coverage() { - source tests/ci/cover.sh - run_coverage_test + # don't re-run coverage on both py27 py3, it takes too long + if [[ -z $SKIP_COVERAGE ]] ; then + source $COVER_DIR_NAME/cover.sh + run_coverage_test + fi } run_functional_test() {