commit 45b43c67b0e902144f1968f8eae3a0c92d2a9b7c
author Shin Wang <shinwang@google.com> Wed Jan 23 03:47:44 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jan 23 03:47:44 2019 +0000
tree 21fd6ee795cacc56e951b34568c9a16fdb8a6d48
parent 6bd40570ebb49d93dedef3a91a24c55491648389
parent 1b37ff6c0934677aaa1c5a22dbb8bc61d600332a

Merge "Aidegen: move code coverage report to temp folder"

PREUPLOAD.cfg

diff --git a/PREUPLOAD.cfg b/PREUPLOAD.cfg
index fda4af7..75cdfc0 100644
--- a/PREUPLOAD.cfg
+++ b/PREUPLOAD.cfg
@@ -2,4 +2,4 @@
 pylint = true
 
 [Hook Scripts]
-aidegen_unittests = atest aidegen_unittests
+aidegen_unittests = ${REPO_ROOT}/prebuilts/asuite/atest/linux-x86/atest aidegen_unittests

aidegen/.coveragerc

diff --git a/aidegen/.coveragerc b/aidegen/.coveragerc
index e1fb5fc..c742664 100644
--- a/aidegen/.coveragerc
+++ b/aidegen/.coveragerc
@@ -15,5 +15,3 @@
 [report]
 show_missing = False
 
-[html]
-directory = aidegen_coverage_report

aidegen/run_tests.sh

diff --git a/aidegen/run_tests.sh b/aidegen/run_tests.sh
index d467844..b3e8008 100755
--- a/aidegen/run_tests.sh
+++ b/aidegen/run_tests.sh
@@ -16,9 +16,10 @@
 
 function print_summary() {
     local test_results=$1
+    local tmp_dir=$(mktemp -d)
     PYTHONPATH=$(get_python_path) python3 -m coverage report
-    PYTHONPATH=$(get_python_path) python3 -m coverage html --rcfile=$rc_file
-    echo "coverage report available at file://$PWD/aidegen_coverage_report/index.html"
+    PYTHONPATH=$(get_python_path) python3 -m coverage html -d $tmp_dir --rcfile=$rc_file
+    echo "coverage report available at file://${tmp_dir}/index.html"
 
     if [[ $test_results -eq 0 ]]; then
         echo -e "${GREEN}All unittests pass${NC}!"
@@ -58,6 +59,9 @@
 function cleanup() {
     # Search for *.pyc and delete them.
     find $AIDEGEN_DIR -name "*.pyc" -exec rm -f {} \;
+
+    # Delete the generated .coverage files too.
+    find $ASUITE_DIR -name "*.coverage" -exec rm -f {} \;
 }
 
 check_env