Merge changes from topic "kselftests-futex-min-kver5.1" into main am: 88a9056dde am: c977ff43a6

Original change: https://android-review.googlesource.com/c/platform/external/linux-kselftest/+/2799344

Change-Id: Idba45ae338f608b8b3c6be19cb1ae142189e90c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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..7685c6de7485 100644
--- a/android/vts_linux_kselftest_arm_32.xml
+++ b/android/vts_linux_kselftest_arm_32.xml
@@ -36,6 +36,7 @@
         <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" />
+        <option name="min-kernel-version" key="futex_functional_run.sh_arm_32" value="5.1" />
         <option name="test-command-line" key="kcmp_kcmp_test_arm_32" value="cd &ktest_dir;/*/.; ./kcmp_test" />
         <option name="test-command-line" key="net_reuseaddr_conflict_arm_32" value="cd &ktest_dir;/*/.; ./reuseaddr_conflict" />
         <option name="test-command-line" key="net_socket_arm_32" value="cd &ktest_dir;/*/.; ./socket" />
diff --git a/android/vts_linux_kselftest_arm_64.xml b/android/vts_linux_kselftest_arm_64.xml
index 42510f2bb91c..c96ba6fa4f0d 100644
--- a/android/vts_linux_kselftest_arm_64.xml
+++ b/android/vts_linux_kselftest_arm_64.xml
@@ -37,6 +37,7 @@
         <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" />
         <option name="test-command-line" key="futex_functional_run.sh_arm_64" value="cd &ktest_dir;/*/.; USE_COLOR=0 ./run.sh" />
+        <option name="min-kernel-version" key="futex_functional_run.sh_arm_64" value="5.1" />
         <option name="test-command-line" key="kcmp_kcmp_test_arm_64" value="cd &ktest_dir;/*/.; ./kcmp_test" />
         <option name="test-command-line" key="kvm_pvm_wipe_mem_arm_64" value="cd &ktest_dir;/*/.; ./pvm_wipe_mem" />
         <option name="test-command-line" key="net_psock_tpacket_arm_64" value="cd &ktest_dir;/*/.; ./psock_tpacket" />
diff --git a/android/vts_linux_kselftest_riscv_64.xml b/android/vts_linux_kselftest_riscv_64.xml
index fc6e371e1f86..1f303035ae6a 100644
--- a/android/vts_linux_kselftest_riscv_64.xml
+++ b/android/vts_linux_kselftest_riscv_64.xml
@@ -35,6 +35,7 @@
         <option name="skip-binary-check" value="true" />
         <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="min-kernel-version" key="futex_functional_run.sh_riscv_64" value="5.1" />
         <option name="test-command-line" key="kcmp_kcmp_test_riscv_64" value="cd &ktest_dir;/*/.; ./kcmp_test" />
         <option name="test-command-line" key="net_psock_tpacket_riscv_64" value="cd &ktest_dir;/*/.; ./psock_tpacket" />
         <option name="test-command-line" key="net_reuseaddr_conflict_riscv_64" value="cd &ktest_dir;/*/.; ./reuseaddr_conflict" />
diff --git a/android/vts_linux_kselftest_x86_32.xml b/android/vts_linux_kselftest_x86_32.xml
index 3dfefddc746f..807b66d003bf 100644
--- a/android/vts_linux_kselftest_x86_32.xml
+++ b/android/vts_linux_kselftest_x86_32.xml
@@ -36,6 +36,7 @@
         <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" />
+        <option name="min-kernel-version" key="futex_functional_run.sh_x86_32" value="5.1" />
         <option name="test-command-line" key="kcmp_kcmp_test_x86_32" value="cd &ktest_dir;/*/.; ./kcmp_test" />
         <option name="test-command-line" key="net_reuseaddr_conflict_x86_32" value="cd &ktest_dir;/*/.; ./reuseaddr_conflict" />
         <option name="test-command-line" key="net_socket_x86_32" value="cd &ktest_dir;/*/.; ./socket" />
diff --git a/android/vts_linux_kselftest_x86_64.xml b/android/vts_linux_kselftest_x86_64.xml
index 9ae59fc40643..2dd249184004 100644
--- a/android/vts_linux_kselftest_x86_64.xml
+++ b/android/vts_linux_kselftest_x86_64.xml
@@ -36,6 +36,7 @@
         <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" />
+        <option name="min-kernel-version" key="futex_functional_run.sh_x86_64" value="5.1" />
         <option name="test-command-line" key="kcmp_kcmp_test_x86_64" value="cd &ktest_dir;/*/.; ./kcmp_test" />
         <option name="test-command-line" key="net_psock_tpacket_x86_64" value="cd &ktest_dir;/*/.; ./psock_tpacket" />
         <option name="test-command-line" key="net_reuseaddr_conflict_x86_64" value="cd &ktest_dir;/*/.; ./reuseaddr_conflict" />