From d6de4eb58bab87c5fc9f887b29aa79801de4e40d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Mon, 29 Feb 2016 14:15:02 +0000
Subject: [PATCH 1/2] CI: Use our docker image

---
 .gitlab-ci.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c7bbfef22..b4ddbfeb9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,3 +1,5 @@
+image: mvdan/fdroid-ci:latest
+
 before_script:
   - apt-get -q update -y
   - echo " == Installing packages required by this CI script"

From 26ce365c226bf5d999fd7009d465989f4f30113a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Mon, 29 Feb 2016 17:06:50 +0000
Subject: [PATCH 2/2] Enable test coverage for Gitlab CI

---
 .gitlab-ci.yml       | 3 ++-
 F-Droid/build.gradle | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b4ddbfeb9..6b0936bfd 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -35,5 +35,6 @@ test:
     - emulator -force-32bit -avd fcl-test -no-skin -no-audio -no-window &
     - ./tools/wait-for-emulator
     - adb shell input keyevent 82
-    - echo " == Running Android tests on the 2.3.7 emulator"
+    - echo " == Running Android tests"
     - ADB_INSTALL_TIMEOUT=8 ./gradlew connectedCheck || { adb logcat -d '*:W'; exit 1; }
+    - sed -n 's/.*"ctr2">\([0-9]*\)%<.*/Coverage - \1.0% covered\n/p' F-Droid/build/reports/coverage/debug/index.html
diff --git a/F-Droid/build.gradle b/F-Droid/build.gradle
index d4f50c534..de5cf6942 100644
--- a/F-Droid/build.gradle
+++ b/F-Droid/build.gradle
@@ -152,6 +152,9 @@ android {
             shrinkResources true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
+        debug {
+            testCoverageEnabled = true
+        }
     }
 
     compileOptions {