diff options
| author | Julien Desprez <jdesprez@google.com> | 2018-03-26 13:45:45 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-03-26 13:45:45 +0000 |
| commit | b133cbfd0b5afb0217ee45c8e26847465c6a717a (patch) | |
| tree | 0050e054769962d73efcabdfc1e1d01164134f59 | |
| parent | 8cb2aba54d97ad89be44867683edce2b500f30f0 (diff) | |
| parent | dbf2127c7fe0999862138126a5c63f2f8c06cb62 (diff) | |
Merge "Add Osu2.apk to the AndroidTest so the tests have a target" into pi-dev
| -rw-r--r-- | packages/Osu2/Android.mk | 1 | ||||
| -rw-r--r-- | packages/Osu2/tests/AndroidTest.xml | 30 |
2 files changed, 31 insertions, 0 deletions
diff --git a/packages/Osu2/Android.mk b/packages/Osu2/Android.mk index 063ac7ec00f4..7de89080e919 100644 --- a/packages/Osu2/Android.mk +++ b/packages/Osu2/Android.mk @@ -12,6 +12,7 @@ LOCAL_PACKAGE_NAME := Osu2 LOCAL_PRIVATE_PLATFORM_APIS := true LOCAL_CERTIFICATE := platform LOCAL_PRIVILEGED_MODULE := true +LOCAL_COMPATIBILITY_SUITE := device-tests include $(BUILD_PACKAGE) diff --git a/packages/Osu2/tests/AndroidTest.xml b/packages/Osu2/tests/AndroidTest.xml new file mode 100644 index 000000000000..9514dab74401 --- /dev/null +++ b/packages/Osu2/tests/AndroidTest.xml @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2018 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<!-- This test config file is auto-generated. --> +<configuration description="Runs OSU App Tests."> + <option name="test-suite-tag" value="apct" /> + <option name="test-suite-tag" value="apct-instrumentation" /> + <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller"> + <option name="cleanup-apks" value="true" /> + <option name="test-file-name" value="Osu2.apk" /> + <option name="test-file-name" value="OsuTests.apk" /> + </target_preparer> + + <test class="com.android.tradefed.testtype.AndroidJUnitTest" > + <option name="package" value="com.android.osu.tests" /> + <option name="runner" value="android.support.test.runner.AndroidJUnitRunner" /> + </test> +</configuration> |