diff options
| author | Julien Desprez <jdesprez@google.com> | 2020-07-08 14:54:48 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-08 14:54:48 +0000 |
| commit | b9615a7b86a457121175baf4833253b45b3b8096 (patch) | |
| tree | 54af720121f633f679fadba96eb51f0e61b23a68 | |
| parent | cea293936636ac1bd56dd6c8fbbd34372bb161f9 (diff) | |
| parent | 874870ce0132d648e051d32f5f9399f7b51a251d (diff) | |
| download | tradefederation-b9615a7b86a457121175baf4833253b45b3b8096.tar.gz | |
Merge "Make sure AppInstant is excluded by default aligning with CTS config" am: 874870ce01
Original change: https://android-review.googlesource.com/c/platform/tools/tradefederation/+/1356883
Change-Id: Ieb6b7b72d806e0800c10d2ffa733f9bee9854469
| -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" /> |