diff options
| author | Yi Jin <jinyithu@google.com> | 2017-12-12 18:24:52 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-12-12 18:24:52 +0000 |
| commit | d04c00a47907452a76d31e7183e5cc37bdf4dbf3 (patch) | |
| tree | 22d9ef792e2d77552b9a34b2bf28f784e45ed79d /cmds/incident_helper | |
| parent | 243c392c3163f31c6d8551172ffe7a41bb32cb10 (diff) | |
| parent | 5e4ce2c9410b130133bb8f9268077ca0f398693e (diff) | |
Merge "Add AndroidTest.xml to incident_helper and incidentd"
Diffstat (limited to 'cmds/incident_helper')
| -rw-r--r-- | cmds/incident_helper/Android.bp | 1 | ||||
| -rw-r--r-- | cmds/incident_helper/AndroidTest.xml | 27 |
2 files changed, 28 insertions, 0 deletions
diff --git a/cmds/incident_helper/Android.bp b/cmds/incident_helper/Android.bp index 2ef037143f07..fc0bdccb268b 100644 --- a/cmds/incident_helper/Android.bp +++ b/cmds/incident_helper/Android.bp @@ -38,6 +38,7 @@ cc_binary { cc_test { name: "incident_helper_test", + test_suites: ["device-tests"], defaults: ["incident_helper_defaults"], local_include_dirs: ["src/"], diff --git a/cmds/incident_helper/AndroidTest.xml b/cmds/incident_helper/AndroidTest.xml new file mode 100644 index 000000000000..6d242bcf435a --- /dev/null +++ b/cmds/incident_helper/AndroidTest.xml @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2017 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. +--> +<configuration description="Config for incident_helper_test"> + <target_preparer class="com.android.tradefed.targetprep.PushFilePreparer"> + <option name="cleanup" value="true" /> + <option name="push" value="incident_helper_test->/data/nativetest/incident_helper_test" /> + <option name="push" value="testdata->/data/nativetest/testdata" /> + </target_preparer> + <option name="test-suite-tag" value="apct" /> + <test class="com.android.tradefed.testtype.GTest" > + <option name="native-test-device-path" value="/data/nativetest" /> + <option name="module-name" value="incident_helper_test" /> + </test> +</configuration> |