diff options
| author | Edward Liaw <edliaw@google.com> | 2023-04-07 03:00:24 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-04-07 03:00:24 +0000 |
| commit | 48d944c70a80c15591c789bcf4e82edea84f6a4f (patch) | |
| tree | b886e4315e6949e66df810f139a937eb1bdf3ad3 | |
| parent | 1b1be1559f898c89ddf54dd64d91302b647e7a10 (diff) | |
| parent | fff960c2592938e923828b3630c5889ccb5f16ff (diff) | |
| download | kernel-48d944c70a80c15591c789bcf4e82edea84f6a4f.tar.gz | |
kselftests: Stop Android framework when running kselftests am: 26a5d5e954 am: dbe54092c4 am: fff960c259
Original change: https://android-review.googlesource.com/c/platform/test/vts-testcase/kernel/+/2528246
Change-Id: I90ceac7db2fcaf7c3bfb7eef80116909018312a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
4 files changed, 8 insertions, 8 deletions
diff --git a/linux_kselftest/testcases/vts_linux_kselftest_arm_32.xml b/linux_kselftest/testcases/vts_linux_kselftest_arm_32.xml index 45740541..75426602 100644 --- a/linux_kselftest/testcases/vts_linux_kselftest_arm_32.xml +++ b/linux_kselftest/testcases/vts_linux_kselftest_arm_32.xml @@ -14,8 +14,8 @@ <!ENTITY ktest_dir "/data/local/tmp/vts_kernel_tests/DATA/nativetest/linux-kselftest"> ]> <configuration description="Runs vts_linux_kselftest."> - <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer"> - </target_preparer> + <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer" /> + <target_preparer class="com.android.tradefed.targetprep.StopServicesSetup" /> <object type="module_controller" class="com.android.tradefed.testtype.suite.module.KernelTestModuleController" > <option name="arch" value="arm"/> diff --git a/linux_kselftest/testcases/vts_linux_kselftest_arm_64.xml b/linux_kselftest/testcases/vts_linux_kselftest_arm_64.xml index fa5237b5..2a33f2c2 100644 --- a/linux_kselftest/testcases/vts_linux_kselftest_arm_64.xml +++ b/linux_kselftest/testcases/vts_linux_kselftest_arm_64.xml @@ -14,8 +14,8 @@ <!ENTITY ktest_dir "/data/local/tmp/vts_kernel_tests/DATA/nativetest64/linux-kselftest"> ]> <configuration description="Runs vts_linux_kselftest."> - <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer"> - </target_preparer> + <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer" /> + <target_preparer class="com.android.tradefed.targetprep.StopServicesSetup" /> <object type="module_controller" class="com.android.tradefed.testtype.suite.module.KernelTestModuleController" > <option name="arch" value="arm64"/> diff --git a/linux_kselftest/testcases/vts_linux_kselftest_x86_32.xml b/linux_kselftest/testcases/vts_linux_kselftest_x86_32.xml index 65ffc656..01375908 100644 --- a/linux_kselftest/testcases/vts_linux_kselftest_x86_32.xml +++ b/linux_kselftest/testcases/vts_linux_kselftest_x86_32.xml @@ -14,8 +14,8 @@ <!ENTITY ktest_dir "/data/local/tmp/vts_kernel_tests/DATA/nativetest/linux-kselftest"> ]> <configuration description="Runs vts_linux_kselftest."> - <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer"> - </target_preparer> + <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer" /> + <target_preparer class="com.android.tradefed.targetprep.StopServicesSetup" /> <object type="module_controller" class="com.android.tradefed.testtype.suite.module.KernelTestModuleController" > <option name="arch" value="x86"/> diff --git a/linux_kselftest/testcases/vts_linux_kselftest_x86_64.xml b/linux_kselftest/testcases/vts_linux_kselftest_x86_64.xml index 2cadfbeb..2022e27c 100644 --- a/linux_kselftest/testcases/vts_linux_kselftest_x86_64.xml +++ b/linux_kselftest/testcases/vts_linux_kselftest_x86_64.xml @@ -14,8 +14,8 @@ <!ENTITY ktest_dir "/data/local/tmp/vts_kernel_tests/DATA/nativetest64/linux-kselftest"> ]> <configuration description="Runs vts_linux_kselftest."> - <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer"> - </target_preparer> + <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer" /> + <target_preparer class="com.android.tradefed.targetprep.StopServicesSetup" /> <object type="module_controller" class="com.android.tradefed.testtype.suite.module.KernelTestModuleController" > <option name="arch" value="x86_64"/> |