summaryrefslogtreecommitdiff
path: root/java/tests/AndroidTest.xml
diff options
context:
space:
mode:
author Matt Casey <mrcasey@google.com> 2022-05-26 21:14:03 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-05-26 21:14:03 +0000
commit4291b9de31093dcb2a8bbfdb479546cb2966d1b1 (patch)
tree8628dc88ae2d465778a2cf81efbf169185fcde48 /java/tests/AndroidTest.xml
parent2a8a1528ec4decc57414994e2b746d4c03c19199 (diff)
parent18aebd5bd6be5a8d367c98274048647e15704254 (diff)
Ignore UnbundledChooserActivityTest am: 78c6881968 am: 18aebd5bd6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/IntentResolver/+/18614358 Change-Id: Ia515dacca979e4b9b2c8f0196edf3db5d6bd58e2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'java/tests/AndroidTest.xml')
-rw-r--r--java/tests/AndroidTest.xml22
1 files changed, 12 insertions, 10 deletions
diff --git a/java/tests/AndroidTest.xml b/java/tests/AndroidTest.xml
index d1d77c10..3daafee2 100644
--- a/java/tests/AndroidTest.xml
+++ b/java/tests/AndroidTest.xml
@@ -14,15 +14,17 @@
limitations under the License.
-->
<configuration description="Run IntentResolver Tests.">
- <target_preparer class="com.android.tradefed.targetprep.TestAppInstallSetup">
- <option name="test-file-name" value="IntentResolverUnitTests.apk" />
- </target_preparer>
+ <!-- Restore these lines once the unbundled chooser is re-enabled.
+ <target_preparer class="com.android.tradefed.targetprep.TestAppInstallSetup">
+ <option name="test-file-name" value="IntentResolverUnitTests.apk" />
+ </target_preparer>
- <option name="test-suite-tag" value="apct" />
- <option name="test-tag" value="IntentResolverUnitTests" />
- <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
- <option name="package" value="com.android.intentresolver.tests" />
- <option name="runner" value="android.testing.TestableInstrumentation" />
- <option name="hidden-api-checks" value="false"/>
- </test>
+ <option name="test-suite-tag" value="apct" />
+ <option name="test-tag" value="IntentResolverUnitTests" />
+ <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
+ <option name="package" value="com.android.intentresolver.tests" />
+ <option name="runner" value="android.testing.TestableInstrumentation" />
+ <option name="hidden-api-checks" value="false"/>
+ </test>
+ -->
</configuration>