diff options
| author | Julien Desprez <jdesprez@google.com> | 2020-07-08 15:10:24 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-08 15:10:24 +0000 |
| commit | 6c1dc6e81ff7af602d5e2b8de2943f5ec6346d49 (patch) | |
| tree | 213c433fc8b6253d355b3ea21572dbc8003ce460 | |
| parent | d205ac3dbf7d15cbd883451798f863341168ba8e (diff) | |
| parent | b9615a7b86a457121175baf4833253b45b3b8096 (diff) | |
| download | tradefederation-6c1dc6e81ff7af602d5e2b8de2943f5ec6346d49.tar.gz | |
Merge "Make sure AppInstant is excluded by default aligning with CTS config" am: 874870ce01 am: b9615a7b86
Original change: https://android-review.googlesource.com/c/platform/tools/tradefederation/+/1356883
Change-Id: Ia35a6d5599619f1df0dc4f77a68f3c1d5362b11a
| -rw-r--r-- | res/config/suite/test_mapping_suite.xml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/res/config/suite/test_mapping_suite.xml b/res/config/suite/test_mapping_suite.xml index 8496121b8..475325587 100644 --- a/res/config/suite/test_mapping_suite.xml +++ b/res/config/suite/test_mapping_suite.xml @@ -37,6 +37,8 @@ <!-- Tell all HostTests to exclude certain annotations --> <option name="test-arg" value="com.android.tradefed.testtype.HostTest:exclude-annotation:android.platform.test.annotations.RestrictedBuildTest" /> <option name="test-arg" value="com.android.compatibility.common.tradefed.testtype.JarHostTest:exclude-annotation:android.platform.test.annotations.RestrictedBuildTest" /> + <option name="test-arg" value="com.android.tradefed.testtype.HostTest:exclude-annotation:android.platform.test.annotations.AppModeInstant" /> + <option name="test-arg" value="com.android.compatibility.common.tradefed.testtype.JarHostTest:exclude-annotation:android.platform.test.annotations.AppModeInstant" /> <!-- Force GTest to report binary name in results --> <option name="test-arg" value="com.android.tradefed.testtype.GTest:prepend-filename:true" /> |