diff options
| author | Edward Liaw <edliaw@google.com> | 2023-10-25 02:03:13 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-10-25 02:03:13 +0000 |
| commit | caf38785c2470c758aec2ca97da5e85fb1124479 (patch) | |
| tree | 711c9c2c47aec4442e89c15d8a4ae72338cf5cb1 | |
| parent | 18c7e0268eacddf2caccfcae789af83d2d6c5db3 (diff) | |
| parent | d152196f622ed4ba20513b9939c0a9117c9b3b21 (diff) | |
| download | linux-kselftest-caf38785c2470c758aec2ca97da5e85fb1124479.tar.gz | |
Revert "kselftests: Increase per binary timeout to 30m" am: d152196f62
Original change: https://android-review.googlesource.com/c/platform/external/linux-kselftest/+/2799345
Change-Id: I1102b5e7d65f8d516c1c02bcdf64bff040131f33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | android/vts_linux_kselftest_arm_32.xml | 1 | ||||
| -rw-r--r-- | android/vts_linux_kselftest_arm_64.xml | 1 | ||||
| -rw-r--r-- | android/vts_linux_kselftest_riscv_64.xml | 1 | ||||
| -rw-r--r-- | android/vts_linux_kselftest_x86_32.xml | 1 | ||||
| -rw-r--r-- | android/vts_linux_kselftest_x86_64.xml | 1 |
5 files changed, 0 insertions, 5 deletions
diff --git a/android/vts_linux_kselftest_arm_32.xml b/android/vts_linux_kselftest_arm_32.xml index 7d4a942c07bb..1919ab01172c 100644 --- a/android/vts_linux_kselftest_arm_32.xml +++ b/android/vts_linux_kselftest_arm_32.xml @@ -33,7 +33,6 @@ <test class="com.android.tradefed.testtype.binary.KernelTargetTest" > <option name="exit-code-skip" value="4" /> <option name="skip-binary-check" value="true" /> - <option name="per-binary-timeout" value="1800000" /> <option name="test-command-line" key="binderfs_arm_32" value="cd &ktest_dir;/*/.; ./binderfs_test" /> <option name="test-command-line" key="capabilities_test_execve_arm_32" value="cd &ktest_dir;/*/.; ./test_execve" /> <option name="test-command-line" key="futex_functional_run.sh_arm_32" value="cd &ktest_dir;/*/.; USE_COLOR=0 ./run.sh" /> diff --git a/android/vts_linux_kselftest_arm_64.xml b/android/vts_linux_kselftest_arm_64.xml index 9fe51bb1233d..42510f2bb91c 100644 --- a/android/vts_linux_kselftest_arm_64.xml +++ b/android/vts_linux_kselftest_arm_64.xml @@ -33,7 +33,6 @@ <test class="com.android.tradefed.testtype.binary.KernelTargetTest" > <option name="exit-code-skip" value="4" /> <option name="skip-binary-check" value="true" /> - <option name="per-binary-timeout" value="1800000" /> <option name="test-command-line" key="binderfs_arm_64" value="cd &ktest_dir;/*/.; ./binderfs_test" /> <option name="test-command-line" key="breakpoints_breakpoint_test_arm64_arm_64" value="cd &ktest_dir;/*/.; ./breakpoint_test" /> <option name="test-command-line" key="capabilities_test_execve_arm_64" value="cd &ktest_dir;/*/.; ./test_execve" /> diff --git a/android/vts_linux_kselftest_riscv_64.xml b/android/vts_linux_kselftest_riscv_64.xml index 3bcc3dfff923..fc6e371e1f86 100644 --- a/android/vts_linux_kselftest_riscv_64.xml +++ b/android/vts_linux_kselftest_riscv_64.xml @@ -33,7 +33,6 @@ <test class="com.android.tradefed.testtype.binary.KernelTargetTest" > <option name="exit-code-skip" value="4" /> <option name="skip-binary-check" value="true" /> - <option name="per-binary-timeout" value="1800000" /> <option name="test-command-line" key="capabilities_test_execve_riscv_64" value="cd &ktest_dir;/*/.; ./test_execve" /> <option name="test-command-line" key="futex_functional_run.sh_riscv_64" value="cd &ktest_dir;/*/.; USE_COLOR=0 ./run.sh" /> <option name="test-command-line" key="kcmp_kcmp_test_riscv_64" value="cd &ktest_dir;/*/.; ./kcmp_test" /> diff --git a/android/vts_linux_kselftest_x86_32.xml b/android/vts_linux_kselftest_x86_32.xml index 0de5cfb779f5..3dfefddc746f 100644 --- a/android/vts_linux_kselftest_x86_32.xml +++ b/android/vts_linux_kselftest_x86_32.xml @@ -33,7 +33,6 @@ <test class="com.android.tradefed.testtype.binary.KernelTargetTest" > <option name="exit-code-skip" value="4" /> <option name="skip-binary-check" value="true" /> - <option name="per-binary-timeout" value="1800000" /> <option name="test-command-line" key="binderfs_x86_32" value="cd &ktest_dir;/*/.; ./binderfs_test" /> <option name="test-command-line" key="capabilities_test_execve_x86_32" value="cd &ktest_dir;/*/.; ./test_execve" /> <option name="test-command-line" key="futex_functional_run.sh_x86_32" value="cd &ktest_dir;/*/.; USE_COLOR=0 ./run.sh" /> diff --git a/android/vts_linux_kselftest_x86_64.xml b/android/vts_linux_kselftest_x86_64.xml index e5d05711c542..9ae59fc40643 100644 --- a/android/vts_linux_kselftest_x86_64.xml +++ b/android/vts_linux_kselftest_x86_64.xml @@ -33,7 +33,6 @@ <test class="com.android.tradefed.testtype.binary.KernelTargetTest" > <option name="exit-code-skip" value="4" /> <option name="skip-binary-check" value="true" /> - <option name="per-binary-timeout" value="1800000" /> <option name="test-command-line" key="binderfs_x86_64" value="cd &ktest_dir;/*/.; ./binderfs_test" /> <option name="test-command-line" key="capabilities_test_execve_x86_64" value="cd &ktest_dir;/*/.; ./test_execve" /> <option name="test-command-line" key="futex_functional_run.sh_x86_64" value="cd &ktest_dir;/*/.; USE_COLOR=0 ./run.sh" /> |