From 71257248f155b650d1e5b3a4f60469539fbbd9ff Mon Sep 17 00:00:00 2001 From: Ronald Braunstein Date: Fri, 30 Aug 2024 14:53:51 +0000 Subject: Create a new test_module_config entries for TEST_MAPPING options As part of adding `test_module_config`: go/test-module-config, we are migrating options from TEST_MAPPING files to Android.bp files. Several cls have already been submitted, but this is a larger change to add the test_module_config entries in bulk to reduce churn on the Android.bp and TEST_MAPPING files. This topic covers the two of the repos with the most changes needed (frameworks/base and cts). The first cls will simply create the entries in the Android.bp file This is a noop operation until they get used via TEST_MAPPING files. The process is: 1) Generate new test_module_configs with reasonable names based on options in TEST_MAPPING files 2) After 1) gets submitted, match the options from Android.bp back to TEST_MAPPING files and update those TEST_MAPPING files with the name from the Andriod.bp. To simplify a little bit, we are also removing adding "exclude-annotation" androidx.test.filters.FlakyTest and org.junit.Ignore from the options set in Android.bp since we recently added Flaky exclusion to all CI test_mapping runs. And junit always ignore @Ignore, no reason to ask it to. Test: ci Change-Id: I3097093d1677a0a5a30c8f4aed7fc96c22c0e84d Flag: NONE # test rename only --- core/tests/GameManagerTests/Android.bp | 7 + core/tests/hdmitests/Android.bp | 7 + core/tests/mockingcoretests/Android.bp | 10 ++ core/tests/timetests/Android.bp | 14 ++ libs/WindowManager/Shell/tests/unittest/Android.bp | 7 + media/tests/AudioPolicyTest/Android.bp | 8 + packages/SettingsLib/tests/integ/Android.bp | 7 + packages/SystemUI/tests/Android.bp | 11 ++ .../tests/InputMethodSystemServerTests/Android.bp | 14 ++ .../PackageManagerServiceTests/host/Android.bp | 7 + .../PackageManagerServiceTests/server/Android.bp | 22 +++ .../PackageManagerServiceTests/unit/Android.bp | 7 + services/tests/displayservicetests/Android.bp | 10 ++ services/tests/dreamservicetests/Android.bp | 10 ++ services/tests/mockingservicestests/Android.bp | 70 +++++++++ .../src/com/android/server/rollback/Android.bp | 10 ++ services/tests/powerservicetests/Android.bp | 10 ++ services/tests/powerstatstests/Android.bp | 20 +++ services/tests/servicestests/Android.bp | 173 +++++++++++++++++++++ services/tests/timetests/Android.bp | 24 +++ services/tests/wmtests/Android.bp | 32 ++++ tests/TrustTests/Android.bp | 7 + 22 files changed, 487 insertions(+) diff --git a/core/tests/GameManagerTests/Android.bp b/core/tests/GameManagerTests/Android.bp index 0e3bc6562edb..a252f8b53fab 100644 --- a/core/tests/GameManagerTests/Android.bp +++ b/core/tests/GameManagerTests/Android.bp @@ -37,3 +37,10 @@ android_test { certificate: "platform", test_suites: ["device-tests"], } + +test_module_config { + name: "FrameworksCoreGameManagerTests_android_app", + base: "FrameworksCoreGameManagerTests", + test_suites: ["device-tests"], + include_filters: ["android.app"], +} diff --git a/core/tests/hdmitests/Android.bp b/core/tests/hdmitests/Android.bp index 5f6eaf96a846..e11bc552cf15 100644 --- a/core/tests/hdmitests/Android.bp +++ b/core/tests/hdmitests/Android.bp @@ -37,3 +37,10 @@ android_test { certificate: "platform", test_suites: ["device-tests"], } + +test_module_config { + name: "HdmiCecTests_hardware_hdmi", + base: "HdmiCecTests", + test_suites: ["device-tests"], + include_filters: ["android.hardware.hdmi"], +} diff --git a/core/tests/mockingcoretests/Android.bp b/core/tests/mockingcoretests/Android.bp index 2d778b1218d2..a494d83a3bef 100644 --- a/core/tests/mockingcoretests/Android.bp +++ b/core/tests/mockingcoretests/Android.bp @@ -62,3 +62,13 @@ android_test { certificate: "platform", } + +test_module_config { + name: "FrameworksMockingCoreTests_os_bundlerecyclingtest", + base: "FrameworksMockingCoreTests", + test_suites: [ + "automotive-tests", + "device-tests", + ], + include_filters: ["android.os.BundleRecyclingTest"], +} diff --git a/core/tests/timetests/Android.bp b/core/tests/timetests/Android.bp index 51181a8a7b13..c33d5ee5008b 100644 --- a/core/tests/timetests/Android.bp +++ b/core/tests/timetests/Android.bp @@ -23,3 +23,17 @@ android_test { certificate: "platform", test_suites: ["device-tests"], } + +test_module_config { + name: "FrameworksTimeCoreTests_android_app", + base: "FrameworksTimeCoreTests", + test_suites: ["device-tests"], + include_filters: ["android.app."], +} + +test_module_config { + name: "FrameworksTimeCoreTests_android_service", + base: "FrameworksTimeCoreTests", + test_suites: ["device-tests"], + include_filters: ["android.service."], +} diff --git a/libs/WindowManager/Shell/tests/unittest/Android.bp b/libs/WindowManager/Shell/tests/unittest/Android.bp index 32c070305e05..872b9b926bb2 100644 --- a/libs/WindowManager/Shell/tests/unittest/Android.bp +++ b/libs/WindowManager/Shell/tests/unittest/Android.bp @@ -86,3 +86,10 @@ android_test { "com.android.wm.shell.tests", ], } + +test_module_config { + name: "WMShellUnitTests_shell_back", + base: "WMShellUnitTests", + test_suites: ["device-tests"], + include_filters: ["com.android.wm.shell.back"], +} diff --git a/media/tests/AudioPolicyTest/Android.bp b/media/tests/AudioPolicyTest/Android.bp index 3dc2a0a9fd7c..43b1a355334a 100644 --- a/media/tests/AudioPolicyTest/Android.bp +++ b/media/tests/AudioPolicyTest/Android.bp @@ -24,3 +24,11 @@ android_test { resource_dirs: ["res"], test_suites: ["device-tests"], } + +test_module_config { + name: "audiopolicytest_audiopolicytest_audiopolicydeathtest_Presubmit", + base: "audiopolicytest", + test_suites: ["device-tests"], + include_filters: ["com.android.audiopolicytest.AudioPolicyDeathTest"], + include_annotations: ["android.platform.test.annotations.Presubmit"], +} diff --git a/packages/SettingsLib/tests/integ/Android.bp b/packages/SettingsLib/tests/integ/Android.bp index f303ab5fc54b..1d8a681bdb88 100644 --- a/packages/SettingsLib/tests/integ/Android.bp +++ b/packages/SettingsLib/tests/integ/Android.bp @@ -71,3 +71,10 @@ android_test { dxflags: ["--multi-dex"], manifest: "AndroidManifest.xml", } + +test_module_config { + name: "SettingsLibTests_settingslib_users", + base: "SettingsLibTests", + test_suites: ["device-tests"], + include_filters: ["com.android.settingslib.users."], +} diff --git a/packages/SystemUI/tests/Android.bp b/packages/SystemUI/tests/Android.bp index 88939a2ba67d..f601387d0910 100644 --- a/packages/SystemUI/tests/Android.bp +++ b/packages/SystemUI/tests/Android.bp @@ -50,3 +50,14 @@ android_test { additional_manifests: ["AndroidManifest.xml"], manifest: "AndroidManifest-base.xml", } + +test_module_config { + name: "SystemUITests_systemui_accessibility", + base: "SystemUITests", + test_suites: ["device-tests"], + include_filters: ["com.android.systemui.accessibility"], + exclude_annotations: [ + "android.platform.test.annotations.Postsubmit", + "android.platform.test.annotations.FlakyTest", + ], +} diff --git a/services/tests/InputMethodSystemServerTests/Android.bp b/services/tests/InputMethodSystemServerTests/Android.bp index 3bce9b54e320..9044259cb39f 100644 --- a/services/tests/InputMethodSystemServerTests/Android.bp +++ b/services/tests/InputMethodSystemServerTests/Android.bp @@ -138,3 +138,17 @@ android_test { enabled: false, }, } + +test_module_config { + name: "FrameworksInputMethodSystemServerTests_server_inputmethod", + base: "FrameworksInputMethodSystemServerTests", + test_suites: ["device-tests"], + include_filters: ["com.android.server.inputmethod"], +} + +test_module_config { + name: "FrameworksImeTests_android_inputmethodservice", + base: "FrameworksImeTests", + test_suites: ["device-tests"], + include_filters: ["com.android.inputmethodservice"], +} diff --git a/services/tests/PackageManagerServiceTests/host/Android.bp b/services/tests/PackageManagerServiceTests/host/Android.bp index 6fd21f74cf8c..75db31679a88 100644 --- a/services/tests/PackageManagerServiceTests/host/Android.bp +++ b/services/tests/PackageManagerServiceTests/host/Android.bp @@ -88,3 +88,10 @@ genrule { " && $(location soong_zip) -o $(genDir)/temp.apk -L 0 -C $(genDir)/apk -D $(genDir)/apk" + " && $(location zipalign) -f 4 $(genDir)/temp.apk $(out)", } + +test_module_config_host { + name: "PackageManagerServiceHostTests_test_overlayactorvisibilitytest", + base: "PackageManagerServiceHostTests", + test_suites: ["device-tests"], + include_filters: ["com.android.server.pm.test.OverlayActorVisibilityTest"], +} diff --git a/services/tests/PackageManagerServiceTests/server/Android.bp b/services/tests/PackageManagerServiceTests/server/Android.bp index ea7bb8b4a1d1..7a980afc2799 100644 --- a/services/tests/PackageManagerServiceTests/server/Android.bp +++ b/services/tests/PackageManagerServiceTests/server/Android.bp @@ -163,3 +163,25 @@ java_genrule { "done && " + "$(location soong_zip) -o $(out) -C $(genDir)/res -D $(genDir)/res", } + +test_module_config { + name: "PackageManagerServiceServerTests_server_pm_Presubmit", + base: "PackageManagerServiceServerTests", + test_suites: [ + "automotive-tests", + "device-tests", + ], + include_filters: ["com.android.server.pm."], + include_annotations: ["android.platform.test.annotations.Presubmit"], +} + +test_module_config { + name: "PackageManagerServiceServerTests_server_pm_Postsubmit", + base: "PackageManagerServiceServerTests", + test_suites: [ + "automotive-tests", + "device-tests", + ], + include_filters: ["com.android.server.pm."], + include_annotations: ["android.platform.test.annotations.Postsubmit"], +} diff --git a/services/tests/PackageManagerServiceTests/unit/Android.bp b/services/tests/PackageManagerServiceTests/unit/Android.bp index c93f48225e48..db88b166b13a 100644 --- a/services/tests/PackageManagerServiceTests/unit/Android.bp +++ b/services/tests/PackageManagerServiceTests/unit/Android.bp @@ -47,3 +47,10 @@ android_test { platform_apis: true, test_suites: ["device-tests"], } + +test_module_config { + name: "PackageManagerServiceUnitTests_verify_domain", + base: "PackageManagerServiceUnitTests", + test_suites: ["device-tests"], + include_filters: ["com.android.server.pm.test.verify.domain"], +} diff --git a/services/tests/displayservicetests/Android.bp b/services/tests/displayservicetests/Android.bp index 3bafe7296fff..61350bf24868 100644 --- a/services/tests/displayservicetests/Android.bp +++ b/services/tests/displayservicetests/Android.bp @@ -56,3 +56,13 @@ android_test { enabled: false, }, } + +test_module_config { + name: "DisplayServiceTests_server_display", + base: "DisplayServiceTests", + test_suites: [ + "automotive-tests", + "device-tests", + ], + include_filters: ["com.android.server.display"], +} diff --git a/services/tests/dreamservicetests/Android.bp b/services/tests/dreamservicetests/Android.bp index 86b3a6cc2b35..6a2ac6188c01 100644 --- a/services/tests/dreamservicetests/Android.bp +++ b/services/tests/dreamservicetests/Android.bp @@ -40,3 +40,13 @@ android_test { enabled: false, }, } + +test_module_config { + name: "DreamServiceTests_server_dreams", + base: "DreamServiceTests", + test_suites: [ + "automotive-tests", + "device-tests", + ], + include_filters: ["com.android.server.dreams"], +} diff --git a/services/tests/mockingservicestests/Android.bp b/services/tests/mockingservicestests/Android.bp index 98968ac309aa..649ea2cb01d6 100644 --- a/services/tests/mockingservicestests/Android.bp +++ b/services/tests/mockingservicestests/Android.bp @@ -332,3 +332,73 @@ test_module_config { test_suites: ["device-tests"], include_filters: ["com.android.server.utils"], } + +test_module_config { + name: "FrameworksMockingServicesTests_android_server", + base: "FrameworksMockingServicesTests", + test_suites: [ + "automotive-tests", + "device-tests", + ], + include_filters: ["com.android.server"], +} + +test_module_config { + name: "FrameworksMockingServicesTests_server_job", + base: "FrameworksMockingServicesTests", + test_suites: [ + "automotive-tests", + "device-tests", + ], + include_filters: ["com.android.server.job"], +} + +test_module_config { + name: "FrameworksMockingServicesTests_server_tare", + base: "FrameworksMockingServicesTests", + test_suites: [ + "automotive-tests", + "device-tests", + ], + include_filters: ["com.android.server.tare"], +} + +test_module_config { + name: "FrameworksMockingServicesTests_server_backup", + base: "FrameworksMockingServicesTests", + test_suites: [ + "automotive-tests", + "device-tests", + ], + include_filters: ["com.android.server.backup"], +} + +test_module_config { + name: "FrameworksMockingServicesTests_server_rescuepartytest", + base: "FrameworksMockingServicesTests", + test_suites: [ + "automotive-tests", + "device-tests", + ], + include_filters: ["com.android.server.RescuePartyTest"], +} + +test_module_config { + name: "FrameworksMockingServicesTests_server_power", + base: "FrameworksMockingServicesTests", + test_suites: [ + "automotive-tests", + "device-tests", + ], + include_filters: ["com.android.server.power"], +} + +test_module_config { + name: "FrameworksMockingServicesTests_server_trust", + base: "FrameworksMockingServicesTests", + test_suites: [ + "automotive-tests", + "device-tests", + ], + include_filters: ["com.android.server.trust"], +} diff --git a/services/tests/mockingservicestests/src/com/android/server/rollback/Android.bp b/services/tests/mockingservicestests/src/com/android/server/rollback/Android.bp index e94b8ad0a9ac..6a16d1e14795 100644 --- a/services/tests/mockingservicestests/src/com/android/server/rollback/Android.bp +++ b/services/tests/mockingservicestests/src/com/android/server/rollback/Android.bp @@ -54,3 +54,13 @@ android_test { "automotive-tests", ], } + +test_module_config { + name: "RollbackPackageHealthObserverTests_server_rollback", + base: "RollbackPackageHealthObserverTests", + test_suites: [ + "automotive-tests", + "device-tests", + ], + include_filters: ["com.android.server.rollback"], +} diff --git a/services/tests/powerservicetests/Android.bp b/services/tests/powerservicetests/Android.bp index 729dcbd11f42..f8cc6d0fedb6 100644 --- a/services/tests/powerservicetests/Android.bp +++ b/services/tests/powerservicetests/Android.bp @@ -44,3 +44,13 @@ android_test { enabled: false, }, } + +test_module_config { + name: "PowerServiceTests_server_power", + base: "PowerServiceTests", + test_suites: [ + "automotive-tests", + "device-tests", + ], + include_filters: ["com.android.server.power"], +} diff --git a/services/tests/powerstatstests/Android.bp b/services/tests/powerstatstests/Android.bp index 51c9d0ae5e5d..989c7f2bf910 100644 --- a/services/tests/powerstatstests/Android.bp +++ b/services/tests/powerstatstests/Android.bp @@ -126,3 +126,23 @@ android_ravenwood_test { ], auto_gen_config: true, } + +test_module_config { + name: "PowerStatsTests_stats_bstatscputimesvalidationtest", + base: "PowerStatsTests", + test_suites: [ + "automotive-tests", + "device-tests", + ], + include_filters: ["com.android.server.power.stats.BstatsCpuTimesValidationTest"], +} + +test_module_config { + name: "PowerStatsTests_power_stats", + base: "PowerStatsTests", + test_suites: [ + "automotive-tests", + "device-tests", + ], + include_filters: ["com.android.server.power.stats"], +} diff --git a/services/tests/servicestests/Android.bp b/services/tests/servicestests/Android.bp index 0f10b8cbea51..ca0ca722f86b 100644 --- a/services/tests/servicestests/Android.bp +++ b/services/tests/servicestests/Android.bp @@ -676,3 +676,176 @@ test_module_config { test_suites: ["device-tests"], include_filters: ["com.android.server.input"], } + +test_module_config { + name: "FrameworksServicesTests_server_job", + base: "FrameworksServicesTests", + test_suites: [ + "automotive-tests", + "device-tests", + ], + include_filters: ["com.android.server.job"], +} + +test_module_config { + name: "FrameworksServicesTests_server_tare", + base: "FrameworksServicesTests", + test_suites: [ + "automotive-tests", + "device-tests", + ], + include_filters: ["com.android.server.tare"], +} + +test_module_config { + name: "FrameworksServicesTests_server_usage", + base: "FrameworksServicesTests", + test_suites: [ + "automotive-tests", + "device-tests", + ], + include_filters: ["com.android.server.usage"], +} + +test_module_config { + name: "FrameworksServicesTests_server_om", + base: "FrameworksServicesTests", + test_suites: [ + "automotive-tests", + "device-tests", + ], + include_filters: ["com.android.server.om"], +} + +test_module_config { + name: "FrameworksServicesTests_server_accessibility", + base: "FrameworksServicesTests", + test_suites: [ + "automotive-tests", + "device-tests", + ], + include_filters: ["com.android.server.accessibility"], +} + +test_module_config { + name: "FrameworksServicesTests_server_binarytransparencyservicetest", + base: "FrameworksServicesTests", + test_suites: [ + "automotive-tests", + "device-tests", + ], + include_filters: ["com.android.server.BinaryTransparencyServiceTest"], +} + +test_module_config { + name: "FrameworksServicesTests_server_pinnerservicetest", + base: "FrameworksServicesTests", + test_suites: [ + "automotive-tests", + "device-tests", + ], + include_filters: ["com.android.server.PinnerServiceTest"], +} + +test_module_config { + name: "FrameworksServicesTests_server_am", + base: "FrameworksServicesTests", + test_suites: [ + "automotive-tests", + "device-tests", + ], + include_filters: ["com.android.server.am."], +} + +test_module_config { + name: "FrameworksServicesTests_server_hdmi", + base: "FrameworksServicesTests", + test_suites: [ + "automotive-tests", + "device-tests", + ], + include_filters: ["com.android.server.hdmi"], +} + +test_module_config { + name: "FrameworksServicesTests_server_logcat", + base: "FrameworksServicesTests", + test_suites: [ + "automotive-tests", + "device-tests", + ], + include_filters: ["com.android.server.logcat"], +} + +test_module_config { + name: "FrameworksServicesTests_server_net_Presubmit", + base: "FrameworksServicesTests", + test_suites: [ + "automotive-tests", + "device-tests", + ], + include_filters: ["com.android.server.net."], + include_annotations: ["android.platform.test.annotations.Presubmit"], +} + +test_module_config { + name: "FrameworksServicesTests_server_policy_Presubmit", + base: "FrameworksServicesTests", + test_suites: [ + "automotive-tests", + "device-tests", + ], + include_filters: ["com.android.server.policy."], + include_annotations: ["android.platform.test.annotations.Presubmit"], +} + +test_module_config { + name: "FrameworksServicesTests_server_policy", + base: "FrameworksServicesTests", + test_suites: [ + "automotive-tests", + "device-tests", + ], + include_filters: ["com.android.server.policy."], +} + +test_module_config { + name: "FrameworksServicesTests_server_power", + base: "FrameworksServicesTests", + test_suites: [ + "automotive-tests", + "device-tests", + ], + include_filters: ["com.android.server.power"], +} + +test_module_config { + name: "FrameworksServicesTests_power_hint", + base: "FrameworksServicesTests", + test_suites: [ + "automotive-tests", + "device-tests", + ], + include_filters: ["com.android.server.power.hint"], +} + +test_module_config { + name: "FrameworksServicesTests_location_contexthub_Postsubmit", + base: "FrameworksServicesTests", + test_suites: [ + "automotive-tests", + "device-tests", + ], + include_filters: ["com.android.server.location.contexthub."], + include_annotations: ["android.platform.test.annotations.Postsubmit"], +} + +test_module_config { + name: "FrameworksServicesTests_server_input", + base: "FrameworksServicesTests", + test_suites: [ + "automotive-tests", + "device-tests", + ], + include_filters: ["com.android.server.input"], +} diff --git a/services/tests/timetests/Android.bp b/services/tests/timetests/Android.bp index 23ab85996fff..05a1433c128e 100644 --- a/services/tests/timetests/Android.bp +++ b/services/tests/timetests/Android.bp @@ -25,3 +25,27 @@ android_test { certificate: "platform", test_suites: ["device-tests"], } + +test_module_config { + name: "FrameworksTimeServicesTests_time", + base: "FrameworksTimeServicesTests", + test_suites: ["device-tests"], + include_filters: [ + "com.android.server.timezonedetector.", + "com.android.server.timedetector.", + ], +} + +test_module_config { + name: "FrameworksTimeServicesTests_server_timedetector", + base: "FrameworksTimeServicesTests", + test_suites: ["device-tests"], + include_filters: ["com.android.server.timedetector."], +} + +test_module_config { + name: "FrameworksTimeServicesTests_server_timezonedetector", + base: "FrameworksTimeServicesTests", + test_suites: ["device-tests"], + include_filters: ["com.android.server.timezonedetector."], +} diff --git a/services/tests/wmtests/Android.bp b/services/tests/wmtests/Android.bp index b2922945aff9..4bdd375bd590 100644 --- a/services/tests/wmtests/Android.bp +++ b/services/tests/wmtests/Android.bp @@ -108,3 +108,35 @@ android_test { ":OverlayTestApp", ], } + +test_module_config { + name: "WmTests_server_policy_Presubmit", + base: "WmTests", + test_suites: [ + "automotive-tests", + "device-tests", + ], + include_filters: ["com.android.server.policy."], + include_annotations: ["android.platform.test.annotations.Presubmit"], +} + +test_module_config { + name: "WmTests_server_policy", + base: "WmTests", + test_suites: [ + "automotive-tests", + "device-tests", + ], + include_filters: ["com.android.server.policy."], +} + +test_module_config { + name: "WmTests_wm_utils_Presubmit", + base: "WmTests", + test_suites: [ + "automotive-tests", + "device-tests", + ], + include_filters: ["com.android.server.wm.utils"], + include_annotations: ["android.platform.test.annotations.Presubmit"], +} diff --git a/tests/TrustTests/Android.bp b/tests/TrustTests/Android.bp index 4e75a1d02a41..8888b32d2c69 100644 --- a/tests/TrustTests/Android.bp +++ b/tests/TrustTests/Android.bp @@ -40,3 +40,10 @@ android_test { platform_apis: true, certificate: "platform", } + +test_module_config { + name: "TrustTests_trust_test", + base: "TrustTests", + test_suites: ["device-tests"], + include_filters: ["android.trust.test"], +} -- cgit v1.2.3-59-g8ed1b