diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2023-01-10 10:08:48 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2023-01-10 10:08:48 +0000 |
commit | 690fa266b73d014441a815be1cbd08b9896f0aa7 (patch) | |
tree | 5e5f9249e662bff6ae7f40997af06e2bdd4343c2 | |
parent | 3a885367115ad06f0003806ac95f60c2881a25bf (diff) | |
parent | 0d12ab20adfbca80523d6bb7f4bfc0f90bd6c898 (diff) | |
download | base-android11-gsi.tar.gz |
Merge "Disable test suites that are failing to compile" into android11-gsiandroid11-gsi
-rw-r--r-- | packages/CarSystemUI/tests/Android.mk | 2 | ||||
-rw-r--r-- | packages/SystemUI/tests/Android.mk | 2 | ||||
-rw-r--r-- | services/tests/servicestests/Android.bp | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/packages/CarSystemUI/tests/Android.mk b/packages/CarSystemUI/tests/Android.mk index 1366568c3a66..08c05cb72130 100644 --- a/packages/CarSystemUI/tests/Android.mk +++ b/packages/CarSystemUI/tests/Android.mk @@ -77,7 +77,7 @@ LOCAL_JACK_COVERAGE_INCLUDE_FILTER := com.android.systemui.*,com.android.keyguar LOCAL_JACK_COVERAGE_EXCLUDE_FILTER := $(jacoco_exclude) ifeq ($(EXCLUDE_SYSTEMUI_TESTS),) - include $(BUILD_PACKAGE) +# include $(BUILD_PACKAGE) # TODO(b/264694201) Re-enable these tests. endif # Reset variables diff --git a/packages/SystemUI/tests/Android.mk b/packages/SystemUI/tests/Android.mk index 38da21e016ec..dee13bed5aff 100644 --- a/packages/SystemUI/tests/Android.mk +++ b/packages/SystemUI/tests/Android.mk @@ -79,7 +79,7 @@ LOCAL_JACK_COVERAGE_INCLUDE_FILTER := com.android.systemui.*,com.android.keyguar LOCAL_JACK_COVERAGE_EXCLUDE_FILTER := $(jacoco_exclude) ifeq ($(EXCLUDE_SYSTEMUI_TESTS),) - include $(BUILD_PACKAGE) +# include $(BUILD_PACKAGE) # TODO(b/264694201) Re-enable these tests. endif # Reset variables diff --git a/services/tests/servicestests/Android.bp b/services/tests/servicestests/Android.bp index 979f4e179e95..73026f4db98d 100644 --- a/services/tests/servicestests/Android.bp +++ b/services/tests/servicestests/Android.bp @@ -5,6 +5,8 @@ android_test { name: "FrameworksServicesTests", + enabled: false, // TODO(b/264694201) Re-enable these tests. + // Include all test java files. srcs: [ "src/**/*.java", |