From 8e60ccb650ba4af516687558fe365540a92a1630 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Wed, 17 Jun 2015 04:27:03 +0200
Subject: workaround for coverage bug (for now!)

see android bug report https://code.google.com/p/android/issues/detail?id=170607
---
 OpenKeychain/build.gradle | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'OpenKeychain/build.gradle')

diff --git a/OpenKeychain/build.gradle b/OpenKeychain/build.gradle
index f85678b67..491926a4e 100644
--- a/OpenKeychain/build.gradle
+++ b/OpenKeychain/build.gradle
@@ -114,7 +114,7 @@ android {
         versionCode 32300
         versionName "3.2.3"
         applicationId "org.sufficientlysecure.keychain"
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "org.sufficientlysecure.keychain.JacocoWorkaroundJUnitRunner"
     }
 
     compileOptions {
@@ -217,7 +217,10 @@ task jacocoTestReport(type:JacocoReport) {
             "${buildDir}/generated/source/buildConfig/debug",
             "${buildDir}/generated/source/r/debug"
     ])
-    executionData = files("${buildDir}/jacoco/testDebug.exec")
+    executionData = files([
+        "${buildDir}/jacoco/testDebug.exec",
+        "${buildDir}/outputs/code-coverage/connected/coverage.ec"
+    ])
 
     reports {
         xml.enabled = true
-- 
cgit v1.2.3