Merge "init_kill_services_test: reboot device first." am: 1ec8c39c3f
am: c05df66c4b
Change-Id: I07eccb159827626f349904815f0be6ee4ea827b1
This commit is contained in:
commit
493ae7be30
2 changed files with 39 additions and 1 deletions
|
@ -3,5 +3,9 @@ cc_test {
|
|||
srcs: ["init_kill_services_test.cpp"],
|
||||
shared_libs: ["libbase"],
|
||||
test_suites: ["general-tests"],
|
||||
require_root: true,
|
||||
|
||||
// TODO(b/153565474): switch back to auto-generation
|
||||
// and add back:
|
||||
// require_root: true,
|
||||
auto_gen_config: false,
|
||||
}
|
||||
|
|
34
init/test_kill_services/AndroidTest.xml
Normal file
34
init/test_kill_services/AndroidTest.xml
Normal file
|
@ -0,0 +1,34 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- Copyright (C) 2020 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="Runs init_kill_services_test.">
|
||||
<option name="test-suite-tag" value="apct" />
|
||||
<option name="test-suite-tag" value="apct-native" />
|
||||
|
||||
<!-- cannot be autogenerated: b/153565474 -->
|
||||
<target_preparer class="com.android.tradefed.targetprep.RebootTargetPreparer" />
|
||||
|
||||
<target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer"/>
|
||||
|
||||
<target_preparer class="com.android.tradefed.targetprep.PushFilePreparer">
|
||||
<option name="cleanup" value="true" />
|
||||
<option name="push" value="init_kill_services_test->/data/local/tmp/init_kill_services_test" />
|
||||
</target_preparer>
|
||||
|
||||
<test class="com.android.tradefed.testtype.GTest" >
|
||||
<option name="native-test-device-path" value="/data/local/tmp" />
|
||||
<option name="module-name" value="init_kill_services_test" />
|
||||
</test>
|
||||
</configuration>
|
Loading…
Reference in a new issue