commit ccd7841d7318c8bccd2de766cfdfa32ecb92bb99
author Hall Liu <hallliu@google.com> Wed Feb 17 18:07:21 2016 -0800
committer Hall Liu <hallliu@google.com> Wed Feb 17 18:07:21 2016 -0800
tree edda40636af06df78de05210b80a8dd73be90d51
parent 8410de6a5416acd174575e116fb5fe3d343c3f0d

Update telecom testing script to use Jacoco

Bug: 27216235
Change-Id: Ib32a82fe922ca9ce9a2f3452c2276c31021cbdfa

scripts/telecom_testing.sh

diff --git a/scripts/telecom_testing.sh b/scripts/telecom_testing.sh
index fa48040..105ec8b 100644
--- a/scripts/telecom_testing.sh
+++ b/scripts/telecom_testing.sh
@@ -54,9 +54,9 @@
     fi
     # Build and exit script early if build fails
     if [ $installwdep = true ] ; then
-      ANDROID_COMPILE_WITH_JACK=false mmma -j40 "packages/services/Telecomm/tests" ${emma_opt}
+      mmma -j40 "packages/services/Telecomm/tests" ${emma_opt}
     else
-      ANDROID_COMPILE_WITH_JACK=false mmm "packages/services/Telecomm/tests" ${emma_opt}
+      mmm "packages/services/Telecomm/tests" ${emma_opt}
     fi
     if [ $? -ne 0 ] ; then
       echo "Make failed! try using -a instead of -i if building with coverage"
@@ -87,6 +87,13 @@
     adb root
     adb wait-for-device
     adb pull /data/user/0/com.android.server.telecom.tests/files/coverage.ec /tmp/
-    java -cp external/emma/lib/emma.jar emma report -r html -sp packages/services/Telecomm/src -in out/target/common/obj/APPS/TelecomUnitTests_intermediates/coverage.em -in /tmp/coverage.ec
+    if [ ! -d "$T/coverage" ] ; then
+      mkdir -p "$T/coverage"
+    fi
+    java -jar "$T/prebuilts/sdk/tools/jack-jacoco-reporter.jar" \
+      --report-dir "$T/coverage/" \
+      --metadata-file "$T/out/target/common/obj/APPS/TelecomUnitTests_intermediates/coverage.em" \
+      --coverage-file "/tmp/coverage.ec" \
+      --source-dir "$T/packages/services/Telecomm/src/"
   fi
 }