From f38bed9616aa1cb31797e5c5db44fd7306ed6875 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Wed, 25 Sep 2024 14:53:59 -0300
Subject: [PATCH] Run instrumentation tests from other gradle modules

and those not annotated with @MediumTest
---
 .cirrus.yml          | 4 ++--
 app/build.gradle.kts | 7 -------
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 6115b778..42537515 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -51,8 +51,8 @@ instrumentation_tests_task:
     adb shell bmgr transport com.stevesoltys.seedvault.transport.ConfigurableBackupTransport;
     adb reboot;
     adb wait-for-device shell 'while [[ -z $(getprop sys.boot_completed) ]]; do sleep 1; done;';
-  run_large_tests_script: ./gradlew -Pinstrumented_test_size=large :app:connectedAndroidTest
-  run_medium_tests_script: ./gradlew -Pinstrumented_test_size=medium :app:connectedAndroidTest
+  run_large_tests_script: ./gradlew -Pandroid.testInstrumentationRunnerArguments.size=large :app:connectedAndroidTest
+  run_other_tests_script: ./gradlew -Pandroid.testInstrumentationRunnerArguments.notAnnotation=androidx.test.filters.LargeTest connectedAndroidTest
   always:
     pull_screenshots_script:
       adb pull /sdcard/seedvault_test_results
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 6a577a10..c1bb3a49 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -32,13 +32,6 @@ android {
         versionNameSuffix = "-${gitDescribe()}"
         testInstrumentationRunner = "com.stevesoltys.seedvault.KoinInstrumentationTestRunner"
         testInstrumentationRunnerArguments["disableAnalytics"] = "true"
-
-        if (project.hasProperty("instrumented_test_size")) {
-            val testSize = project.property("instrumented_test_size").toString()
-            println("Instrumented test size: $testSize")
-
-            testInstrumentationRunnerArguments["size"] = testSize
-        }
     }
 
     signingConfigs {