diff options
| author | Martin Stjernholm <mast@google.com> | 2023-08-01 12:02:46 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-08-01 12:02:46 +0000 |
| commit | eee306fce427c73458b04aa7f4b9345e93b48d5f (patch) | |
| tree | 25f0aa7b1f95ca34a1d5382d826f1fd413021ca7 | |
| parent | ec0f454dd9cc46c583fbd74405a9729ded37e9f8 (diff) | |
| parent | 28b75babb2c7199735d3d69901fee00a91873deb (diff) | |
| download | cts-eee306fce427c73458b04aa7f4b9345e93b48d5f.tar.gz | |
RESTRICT AUTOMERGE Move ART test failures to the appropriate exclusion am: c04d3b5797 am: 28b75babb2
Original change: https://android-review.googlesource.com/c/platform/cts/+/2652046
Change-Id: Ic366ad2fb069773d991783dac2f895e3ceec48e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | tools/cts-tradefed/res/config/cts-exclude.xml | 12 | ||||
| -rw-r--r-- | tools/cts-tradefed/res/config/cts-known-failures.xml | 11 |
2 files changed, 11 insertions, 12 deletions
diff --git a/tools/cts-tradefed/res/config/cts-exclude.xml b/tools/cts-tradefed/res/config/cts-exclude.xml index 112660db803..c62ac11de13 100644 --- a/tools/cts-tradefed/res/config/cts-exclude.xml +++ b/tools/cts-tradefed/res/config/cts-exclude.xml @@ -38,16 +38,4 @@ <!-- Exclude @SecurityTest tests from CTS. These are tested in STS. b/180417031--> <option name="compatibility:test-arg" value="com.android.tradefed.testtype.AndroidJUnitTest:exclude-annotation:android.platform.test.annotations.AsbSecurityTest" /> <option name="compatibility:test-arg" value="com.android.compatibility.common.tradefed.testtype.JarHostTest:exclude-annotation:android.platform.test.annotations.AsbSecurityTest" /> - - <!-- Exclude JvmtiHostTest911 as it's tested in MTS and depends on implementation details of the ART module. http://b/286797612 --> - <option name="compatibility:exclude-filter" value="CtsJvmtiRunTest911HostTestCases" /> - <!-- Exclude few tests as it depends on implementation details of the ART module. b/287732826 --> - <option name="compatibility:exclude-filter" value="CtsJvmtiRunTest913HostTestCases" /> - <option name="compatibility:exclude-filter" value="CtsJvmtiRunTest912HostTestCases" /> - <option name="compatibility:exclude-filter" value="CtsJvmtiRunTest988HostTestCases" /> - - <!-- Exclude art_standalone_dex2oat_cts_tests which cannot link with recent - ART module due to internal library symbol changes. b/288212464#comment5 --> - <option name="compatibility:exclude-filter" value="art_standalone_dex2oat_cts_tests" /> - </configuration> diff --git a/tools/cts-tradefed/res/config/cts-known-failures.xml b/tools/cts-tradefed/res/config/cts-known-failures.xml index 67beafe8dd1..07bedeaeab6 100644 --- a/tools/cts-tradefed/res/config/cts-known-failures.xml +++ b/tools/cts-tradefed/res/config/cts-known-failures.xml @@ -327,4 +327,15 @@ <option name="compatibility:exclude-filter" value="CtsDevicePolicyTestCases[run-on-clone-profile]" /> <option name="compatibility:exclude-filter" value="CtsOsTestCases[run-on-clone-profile]" /> <option name="compatibility:exclude-filter" value="CtsMultiUserTestCases[run-on-clone-profile]" /> + + <!-- b/286797612 --> + <option name="compatibility:exclude-filter" value="CtsJvmtiRunTest911HostTestCases" /> + + <!-- b/287732826 --> + <option name="compatibility:exclude-filter" value="CtsJvmtiRunTest912HostTestCases" /> + <option name="compatibility:exclude-filter" value="CtsJvmtiRunTest913HostTestCases" /> + <option name="compatibility:exclude-filter" value="CtsJvmtiRunTest988HostTestCases" /> + + <!-- b/288212464#comment5 --> + <option name="compatibility:exclude-filter" value="art_standalone_dex2oat_cts_tests" /> </configuration> |