diff options
| author | Paul Duffin <paulduffin@google.com> | 2019-02-18 05:29:08 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-02-18 05:29:08 -0800 |
| commit | aa3bc8c124c30cea8b7415e8c4e8ab5b08740e4a (patch) | |
| tree | c78e4202f8dada2a9ce3853b50e9c6c935a44e5d | |
| parent | 81a50da935abc314ffe5fe17fa8484ca3872f2a9 (diff) | |
| parent | 013c64ce690002b031c1e1ea8baabac582c31c14 (diff) | |
| download | cts-temp-124234733-master.tar.gz | |
Merge "Verify that android.test.runner includes android.test.base"temp-124234733-master
am: 013c64ce69
Change-Id: Ic4ccd87d819ce6998a2bd0eb5d6ec33b89ba4fea
| -rw-r--r-- | tests/signature/api-check/android-test-runner-current-api/Android.mk | 1 | ||||
| -rw-r--r-- | tests/signature/api-check/android-test-runner-current-api/AndroidTest.xml | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/tests/signature/api-check/android-test-runner-current-api/Android.mk b/tests/signature/api-check/android-test-runner-current-api/Android.mk index d840506022f..9f0aad4e1a2 100644 --- a/tests/signature/api-check/android-test-runner-current-api/Android.mk +++ b/tests/signature/api-check/android-test-runner-current-api/Android.mk @@ -19,6 +19,7 @@ include $(CLEAR_VARS) LOCAL_PACKAGE_NAME := CtsAndroidTestRunnerCurrentApiSignatureTestCases LOCAL_SIGNATURE_API_FILES := \ + android-test-base-current.api \ android-test-mock-current.api \ android-test-runner-current.api \ diff --git a/tests/signature/api-check/android-test-runner-current-api/AndroidTest.xml b/tests/signature/api-check/android-test-runner-current-api/AndroidTest.xml index 703caf7f6bf..b94b0a7bbb2 100644 --- a/tests/signature/api-check/android-test-runner-current-api/AndroidTest.xml +++ b/tests/signature/api-check/android-test-runner-current-api/AndroidTest.xml @@ -21,6 +21,9 @@ <option name="teardown-command" value="rm -rf /data/local/tmp/signature-test" /> </target_preparer> <target_preparer class="com.android.compatibility.common.tradefed.targetprep.FilePusher"> + <option name="push" value="android-test-base-current.api->/data/local/tmp/signature-test/android-test-base-current.api" /> + </target_preparer> + <target_preparer class="com.android.compatibility.common.tradefed.targetprep.FilePusher"> <option name="push" value="android-test-mock-current.api->/data/local/tmp/signature-test/android-test-mock-current.api" /> </target_preparer> <target_preparer class="com.android.compatibility.common.tradefed.targetprep.FilePusher"> @@ -34,7 +37,7 @@ <option name="package" value="android.signature.cts.api.android_test_runner_current" /> <option name="runner" value="repackaged.android.test.InstrumentationTestRunner" /> <option name="class" value="android.signature.cts.api.current.runner.SignatureTest" /> - <option name="instrumentation-arg" key="expected-api-files" value="android-test-mock-current.api,android-test-runner-current.api" /> + <option name="instrumentation-arg" key="expected-api-files" value="android-test-base-current.api,android-test-mock-current.api,android-test-runner-current.api" /> <option name="runtime-hint" value="5s" /> </test> </configuration> |