diff options
| author | Edward Liaw <edliaw@google.com> | 2023-10-13 23:06:40 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-10-13 23:06:40 +0000 |
| commit | 550ccee8092ffff673c41f01d8405a604c8b43eb (patch) | |
| tree | 0ae6356dfb7f59953bb36bacbc10e4d2bd9f247e | |
| parent | 37a352367ecc804e5cc399914f1cd8ad293c8d10 (diff) | |
| parent | 28968f8868592f35cdbeff8f79fc0e54825d415c (diff) | |
| download | linux-kselftest-550ccee8092ffff673c41f01d8405a604c8b43eb.tar.gz | |
Merge "kselftests: Increase per binary timeout to 30m" into main am: 28968f8868
Original change: https://android-review.googlesource.com/c/platform/external/linux-kselftest/+/2787030
Change-Id: I507d79c534eeff0a8595f192219913d7d4f9e07c
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, 5 insertions, 0 deletions
diff --git a/android/vts_linux_kselftest_arm_32.xml b/android/vts_linux_kselftest_arm_32.xml index 1919ab01172c..7d4a942c07bb 100644 --- a/android/vts_linux_kselftest_arm_32.xml +++ b/android/vts_linux_kselftest_arm_32.xml @@ -33,6 +33,7 @@ <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 42510f2bb91c..9fe51bb1233d 100644 --- a/android/vts_linux_kselftest_arm_64.xml +++ b/android/vts_linux_kselftest_arm_64.xml @@ -33,6 +33,7 @@ <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 fc6e371e1f86..3bcc3dfff923 100644 --- a/android/vts_linux_kselftest_riscv_64.xml +++ b/android/vts_linux_kselftest_riscv_64.xml @@ -33,6 +33,7 @@ <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 3dfefddc746f..0de5cfb779f5 100644 --- a/android/vts_linux_kselftest_x86_32.xml +++ b/android/vts_linux_kselftest_x86_32.xml @@ -33,6 +33,7 @@ <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 9ae59fc40643..e5d05711c542 100644 --- a/android/vts_linux_kselftest_x86_64.xml +++ b/android/vts_linux_kselftest_x86_64.xml @@ -33,6 +33,7 @@ <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" /> |