Merge remote-tracking branch 'chiiph/feature/improve_coverage_report' into develop

1 files changed, 2 insertions, 12 deletions

diff --git a/run_tests.sh b/run_tests.sh
index 500cf53c..9f9262ba 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -64,7 +64,7 @@ done
 
 # If enabled, tell nose to collect coverage data
 if [ $coverage -eq 1 ]; then
-    noseopts="$noseopts --with-coverage --cover-package=leap"
+    noseopts="$noseopts --with-coverage --cover-package=leap --cover-html --cover-html-dir=docs/covhtml/ --cover-erase"
 fi
 
 if [ $no_site_packages -eq 1 ]; then
@@ -153,18 +153,8 @@ if [ -z "$noseargs" ]; then
   fi
 fi
 
-function run_coverage {
-    cov_opts="--include=`pwd`/src/leap/*" #,`pwd`/src/leap/eip/*"
-    cov_opts="$cov_opts --omit=`pwd`/src/leap/gui/ui_*,`pwd`/src/leap/gui/*_rc.py*"
-    #cov_opts="--omit=`pwd`/src/leap/base/tests/*,`pwd`/src/leap/eip/tests/*,`pwd`/src/leap/gui/tests/*"
-    #cov_opts="$cov_opts,`pwd`/src/leap/util/tests/* "
-    #cov_opts="$cov_opts --include=`pwd`/src/leap/*" #,`pwd`/src/leap/eip/*"
-    ${wrapper} coverage html -d docs/covhtml -i $cov_opts
-    echo "now point your browser at docs/covhtml/index.html"
-}
-
 if [ $coverage -eq 1 ]; then
     echo "Generating coverage report in docs/covhtml/"
-    run_coverage
+    echo "now point your browser at docs/covhtml/index.html"
     exit
 fi