Merge "tox: Split tests into separate tox environments"

1 files changed, 20 insertions, 9 deletions

diff --git a/run_tests.sh b/run_tests.sh
index 097935890..dda760218 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -9,9 +9,10 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
 
-# Run yardstick's flake8, unit, coverage, functional test
+# Run yardstick's unit, coverage, functional test
 
 getopts ":f" FILE_OPTION
+opts=$@ # get other args
 
 # don't write .pyc files this can cause odd unittest results
 export PYTHONDONTWRITEBYTECODE=1
@@ -45,11 +46,8 @@ run_tests() {
 }
 
 run_coverage() {
-    # 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
+    source $COVER_DIR_NAME/cover.sh
+    run_coverage_test
 }
 
 run_functional_test() {
@@ -68,7 +66,20 @@ run_functional_test() {
     fi
 }
 
+if [[ $opts =~ "--unit" ]]; then
+    run_tests
+fi
+
+if [[ $opts =~ "--coverage" ]]; then
+    run_coverage
+fi
+
+if [[ $opts =~ "--functional" ]]; then
+    run_functional_test
+fi
 
-run_tests
-run_coverage
-run_functional_test
+if [[ -z $opts ]]; then
+    echo "No tests to run!!"
+    echo "Usage: run_tests.sh [--unit] [--coverage] [--functional]"
+    exit 1
+fi