diff options
Diffstat (limited to 'services/tests/servicestests/Android.bp')
-rw-r--r-- | services/tests/servicestests/Android.bp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/services/tests/servicestests/Android.bp b/services/tests/servicestests/Android.bp index c333eb7eed46..c6317e46f70b 100644 --- a/services/tests/servicestests/Android.bp +++ b/services/tests/servicestests/Android.bp @@ -264,7 +264,7 @@ FLAKY_AND_IGNORED = [ test_module_config { name: "FrameworksServicesTests_contentprotection", base: "FrameworksServicesTests", - test_suites: ["general-tests"], + test_suites: ["device-tests"], include_filters: ["com.android.server.contentprotection"], exclude_annotations: FLAKY_AND_IGNORED, } @@ -272,7 +272,7 @@ test_module_config { test_module_config { name: "FrameworksServicesTests_om", base: "FrameworksServicesTests", - test_suites: ["general-tests"], + test_suites: ["device-tests"], include_filters: ["com.android.server.om."], exclude_annotations: FLAKY_AND_IGNORED, } @@ -281,7 +281,7 @@ test_module_config { test_module_config { name: "FrameworksServicesTests_contexthub_presubmit", base: "FrameworksServicesTests", - test_suites: ["general-tests"], + test_suites: ["device-tests"], include_filters: ["com.android.server.location.contexthub."], // TODO(ron): are these right, does it run anything? include_annotations: ["android.platform.test.annotations.Presubmit"], @@ -291,7 +291,7 @@ test_module_config { test_module_config { name: "FrameworksServicesTests_contexthub_postsubmit", base: "FrameworksServicesTests", - test_suites: ["general-tests"], + test_suites: ["device-tests"], include_filters: ["com.android.server.location.contexthub."], // TODO(ron): are these right, does it run anything? include_annotations: ["android.platform.test.annotations.Postsubmit"], @@ -302,7 +302,7 @@ test_module_config { test_module_config { name: "FrameworksServicesTests_contentcapture", base: "FrameworksServicesTests", - test_suites: ["general-tests"], + test_suites: ["device-tests"], include_filters: ["com.android.server.contentcapture"], exclude_annotations: FLAKY_AND_IGNORED, } @@ -310,7 +310,7 @@ test_module_config { test_module_config { name: "FrameworksServicesTests_recoverysystem", base: "FrameworksServicesTests", - test_suites: ["general-tests"], + test_suites: ["device-tests"], include_filters: ["com.android.server.recoverysystem."], exclude_annotations: ["androidx.test.filters.FlakyTest"], } @@ -319,7 +319,7 @@ test_module_config { test_module_config { name: "FrameworksServicesTests_pm_presubmit", base: "FrameworksServicesTests", - test_suites: ["general-tests"], + test_suites: ["device-tests"], include_annotations: ["android.platform.test.annotations.Presubmit"], include_filters: ["com.android.server.pm."], exclude_annotations: FLAKY_AND_IGNORED, @@ -328,7 +328,7 @@ test_module_config { test_module_config { name: "FrameworksServicesTests_pm_postsubmit", base: "FrameworksServicesTests", - test_suites: ["general-tests"], + test_suites: ["device-tests"], include_annotations: ["android.platform.test.annotations.Postsubmit"], include_filters: ["com.android.server.pm."], exclude_annotations: FLAKY_AND_IGNORED, @@ -338,6 +338,6 @@ test_module_config { test_module_config { name: "FrameworksServicesTests_os", base: "FrameworksServicesTests", - test_suites: ["general-tests"], + test_suites: ["device-tests"], include_filters: ["com.android.server.os."], } |