[tor-commits] [tor-browser/tor-browser-60.1.0esr-8.0-1] Bug 25741 - TBA: Exclude unwanted Stumbler tests

[gk at torproject.org]

commit 214bccd0cd359301724fe13d3979c1d1911be6ad
Author: Matthew Finkel <Matthew.Finkel at gmail.com>
Date:   Mon Apr 16 13:47:48 2018 +0000

    Bug 25741 - TBA: Exclude unwanted Stumbler tests
    
    When the stumbler service is ifdef-disabled because MOZ_ANDROID_MLS_STUMBLER
    is not defined, then the unit test compilation fails because some values are
    never declared and defined. We exclude all testStumbler*.java files from
    the robocop gecko test source tree.
---
 mobile/android/app/build.gradle | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/mobile/android/app/build.gradle b/mobile/android/app/build.gradle
index f18e933a03d2..7c515bbe65a7 100644
--- a/mobile/android/app/build.gradle
+++ b/mobile/android/app/build.gradle
@@ -186,6 +186,11 @@ android {
         androidTest {
             java {
                 srcDir "${topsrcdir}/mobile/android/tests/browser/robocop/src"
+
+                if (!mozconfig.substs.MOZ_ANDROID_MLS_STUMBLER) {
+                    exclude 'org/mozilla/gecko/tests/testStumbler*.java'
+                }
+
                 // Bug 1229149 tracks pushing this into a :services Gradle project.
                 srcDir "${topsrcdir}/mobile/android/services/src/androidTest/java"
                 srcDir "${topsrcdir}/mobile/android/tests/browser/junit3/src"