X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=run_tests.sh;h=b3cbfb12747bab4ce1edf0f324df525aebb72bb6;hb=d70cbc5c6bd03cb68a13dcab50a12178982f5c44;hp=2cf54c708534d87dc7c459434496b30115621035;hpb=66ee8251059315274f98eb1eef4eb3f8dda92b6e;p=yardstick.git

diff --git a/run_tests.sh b/run_tests.sh
index 2cf54c708..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() {
@@ -80,7 +89,6 @@ run_functional_test() {
     fi
 }
 
-export PYTHONPATH='yardstick/vTC/apexlake'
 
 run_flake8
 run_tests