tmakin/ack-tegra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ANDROID: Run futex tests individually

Browse Source 
Instead of using the shell script to run each test, run each futex test
on its own.  The shell script does not handle skipped subtests and does
not add any additional testing logic.

Bug: 291147200
Change-Id: Id8687e722bbdc0df527eb0bbe87bb442fb2f0c60
Signed-off-by: Edward Liaw <edliaw@google.com>
This commit is contained in:
Edward Liaw
2023-12-07 13:21:53 +00:00
parent c072379879
commit 4ff8382d3b
3 changed files with 57 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
BUILD.bazel
+1 -12
View File
@@ -17,7 +17,7 @@ load(
"kernel_modules_install",
"merged_kernel_uapi_headers",
)
load(":abi.bzl", "cc_binary_with_abi", "sh_binary_with_abi")
load(":abi.bzl", "cc_binary_with_abi")
load(":modules.bzl", "get_gki_modules_list")
package(
@@ -1295,15 +1295,6 @@ cc_binary_with_abi(
],
)
sh_binary_with_abi(
name = "kselftest_futex_run",
src = "tools/testing/selftests/futex/functional/run.sh",
out = "kselftest_futex_run",
path_prefix = _KSELFTEST_DIR,
target_compatible_with = ["@platforms//os:android"],
visibility = ["//visibility:private"],
)
cc_binary_with_abi(
name = "kselftest_mm_compaction_test",
srcs = ["tools/testing/selftests/mm/compaction_test.c"],
@@ -1819,7 +1810,6 @@ android_filegroup(
":kselftest_futex_futex_wait_wouldblock_x86_64",
":kselftest_futex_futex_wait_x86_64",
":kselftest_futex_futex_waitv_x86_64",
":kselftest_futex_run_x86_64",
":kselftest_gen_config",
":kselftest_kcmp_kcmp_test_x86_64",
":kselftest_mm_compaction_test_x86_64",
@@ -1880,7 +1870,6 @@ android_filegroup(
":kselftest_futex_futex_wait_uninitialized_heap_arm64",
":kselftest_futex_futex_wait_wouldblock_arm64",
":kselftest_futex_futex_waitv_arm64",
":kselftest_futex_run_arm64",
":kselftest_gen_config",
":kselftest_kcmp_kcmp_test_arm64",
":kselftest_mm_compaction_test_arm64",
tools/testing/selftests/android/config_arm64.xml
+28 -1
View File
@@ -19,7 +19,34 @@ SPDX-License-Identifier: GPL-2.0 OR Apache-2.0
<option name="skip-binary-check" value="true" />
<option name="test-command-line" key="kselftest_binderfs_binderfs_test" value="/data/selftests/arm64/kselftest_binderfs_binderfs_test" />
<option name="test-command-line" key="kselftest_breakpoints_breakpoint_test" value="/data/selftests/arm64/kselftest_breakpoints_breakpoint_test" />
<option name="test-command-line" key="kselftest_futex_run" value="cd /data/selftests/arm64/;USE_COLOR=0 ./kselftest_futex_run" />
<option name="test-command-line" key="kselftest_futex_requeue_pi" value="/data/selftests/arm64/futex_requeue_pi" />
<option name="test-command-line" key="kselftest_futex_requeue_pi_b" value="/data/selftests/arm64/futex_requeue_pi -b" />
<option name="test-command-line" key="kselftest_futex_requeue_pi_bl" value="/data/selftests/arm64/futex_requeue_pi -b -l" />
<option name="test-command-line" key="kselftest_futex_requeue_pi_bo" value="/data/selftests/arm64/futex_requeue_pi -b -o" />
<option name="test-command-line" key="kselftest_futex_requeue_pi_l" value="/data/selftests/arm64/futex_requeue_pi -l" />
<option name="test-command-line" key="kselftest_futex_requeue_pi_o" value="/data/selftests/arm64/futex_requeue_pi -o" />
<option name="test-command-line" key="kselftest_futex_requeue_pi_5k" value="/data/selftests/arm64/futex_requeue_pi -t 5000" />
<option name="test-command-line" key="kselftest_futex_requeue_pi_b_5k" value="/data/selftests/arm64/futex_requeue_pi -b -t 5000" />
<option name="test-command-line" key="kselftest_futex_requeue_pi_bl_5k" value="/data/selftests/arm64/futex_requeue_pi -b -l -t 5000" />
<option name="test-command-line" key="kselftest_futex_requeue_pi_bo_5k" value="/data/selftests/arm64/futex_requeue_pi -b -o -t 5000" />
<option name="test-command-line" key="kselftest_futex_requeue_pi_l_5k" value="/data/selftests/arm64/futex_requeue_pi -l -t 5000" />
<option name="test-command-line" key="kselftest_futex_requeue_pi_o_5k" value="/data/selftests/arm64/futex_requeue_pi -o -t 5000" />
<option name="test-command-line" key="kselftest_futex_requeue_pi_500k" value="/data/selftests/arm64/futex_requeue_pi -t 500000" />
<option name="test-command-line" key="kselftest_futex_requeue_pi_b_500k" value="/data/selftests/arm64/futex_requeue_pi -b -t 500000" />
<option name="test-command-line" key="kselftest_futex_requeue_pi_bl_500k" value="/data/selftests/arm64/futex_requeue_pi -b -l -t 500000" />
<option name="test-command-line" key="kselftest_futex_requeue_pi_bo_500k" value="/data/selftests/arm64/futex_requeue_pi -b -o -t 500000" />
<option name="test-command-line" key="kselftest_futex_requeue_pi_l_500k" value="/data/selftests/arm64/futex_requeue_pi -l -t 500000" />
<option name="test-command-line" key="kselftest_futex_requeue_pi_o_500k" value="/data/selftests/arm64/futex_requeue_pi -o -t 500000" />
<option name="test-command-line" key="kselftest_futex_requeue_pi_bl_2G" value="/data/selftests/arm64/futex_requeue_pi -b -l -t 2000000000" />
<option name="test-command-line" key="kselftest_futex_requeue_pi_l_2G" value="/data/selftests/arm64/futex_requeue_pi -l -t 2000000000" />
<option name="test-command-line" key="kselftest_futex_requeue_pi_mismatched_ops" value="/data/selftests/arm64/futex_requeue_pi_mismatched_ops" />
<option name="test-command-line" key="kselftest_futex_requeue_pi_signal_restart" value="/data/selftests/arm64/futex_requeue_pi_signal_restart" />
<option name="test-command-line" key="kselftest_futex_wait_timeout" value="/data/selftests/arm64/futex_wait_timeout" />
<option name="test-command-line" key="kselftest_futex_wait_wouldblock" value="/data/selftests/arm64/futex_wait_wouldblock" />
<option name="test-command-line" key="kselftest_futex_wait_uninitialized_heap" value="/data/selftests/arm64/futex_wait_uninitialized_heap" />
<option name="test-command-line" key="kselftest_futex_wait_private_mapped_file" value="/data/selftests/arm64/futex_wait_private_mapped_file" />
<option name="test-command-line" key="kselftest_futex_wait" value="/data/selftests/arm64/futex_wait" />
<option name="test-command-line" key="kselftest_futex_requeue" value="/data/selftests/arm64/futex_requeue" />
<option name="test-command-line" key="kselftest_kcmp_kcmp_test" value="/data/selftests/arm64/kselftest_kcmp_kcmp_test" />
<option name="test-command-line" key="kselftest_ptrace_peeksiginfo" value="/data/selftests/arm64/kselftest_ptrace_peeksiginfo" />
<option name="test-command-line" key="kselftest_rtc_rtctest" value="/data/selftests/arm64/kselftest_rtc_rtctest" />
tools/testing/selftests/android/config_x86_64.xml
+28 -1
View File
@@ -19,7 +19,34 @@ SPDX-License-Identifier: GPL-2.0 OR Apache-2.0
<option name="skip-binary-check" value="true" />
<option name="test-command-line" key="kselftest_binderfs_binderfs_test" value="/data/selftests/x86_64/kselftest_binderfs_binderfs_test" />
<option name="test-command-line" key="kselftest_breakpoints_breakpoint_test" value="/data/selftests/x86_64/kselftest_breakpoints_breakpoint_test" />
<option name="test-command-line" key="kselftest_futex_run" value="cd /data/selftests/x86_64/;USE_COLOR=0 ./kselftest_futex_run" />
<option name="test-command-line" key="kselftest_futex_requeue_pi" value="/data/selftests/x86_64/futex_requeue_pi" />
<option name="test-command-line" key="kselftest_futex_requeue_pi_b" value="/data/selftests/x86_64/futex_requeue_pi -b" />
<option name="test-command-line" key="kselftest_futex_requeue_pi_bl" value="/data/selftests/x86_64/futex_requeue_pi -b -l" />
<option name="test-command-line" key="kselftest_futex_requeue_pi_bo" value="/data/selftests/x86_64/futex_requeue_pi -b -o" />
<option name="test-command-line" key="kselftest_futex_requeue_pi_l" value="/data/selftests/x86_64/futex_requeue_pi -l" />
<option name="test-command-line" key="kselftest_futex_requeue_pi_o" value="/data/selftests/x86_64/futex_requeue_pi -o" />
<option name="test-command-line" key="kselftest_futex_requeue_pi_5k" value="/data/selftests/x86_64/futex_requeue_pi -t 5000" />
<option name="test-command-line" key="kselftest_futex_requeue_pi_b_5k" value="/data/selftests/x86_64/futex_requeue_pi -b -t 5000" />
<option name="test-command-line" key="kselftest_futex_requeue_pi_bl_5k" value="/data/selftests/x86_64/futex_requeue_pi -b -l -t 5000" />
<option name="test-command-line" key="kselftest_futex_requeue_pi_bo_5k" value="/data/selftests/x86_64/futex_requeue_pi -b -o -t 5000" />
<option name="test-command-line" key="kselftest_futex_requeue_pi_l_5k" value="/data/selftests/x86_64/futex_requeue_pi -l -t 5000" />
<option name="test-command-line" key="kselftest_futex_requeue_pi_o_5k" value="/data/selftests/x86_64/futex_requeue_pi -o -t 5000" />
<option name="test-command-line" key="kselftest_futex_requeue_pi_500k" value="/data/selftests/x86_64/futex_requeue_pi -t 500000" />
<option name="test-command-line" key="kselftest_futex_requeue_pi_b_500k" value="/data/selftests/x86_64/futex_requeue_pi -b -t 500000" />
<option name="test-command-line" key="kselftest_futex_requeue_pi_bl_500k" value="/data/selftests/x86_64/futex_requeue_pi -b -l -t 500000" />
<option name="test-command-line" key="kselftest_futex_requeue_pi_bo_500k" value="/data/selftests/x86_64/futex_requeue_pi -b -o -t 500000" />
<option name="test-command-line" key="kselftest_futex_requeue_pi_l_500k" value="/data/selftests/x86_64/futex_requeue_pi -l -t 500000" />
<option name="test-command-line" key="kselftest_futex_requeue_pi_o_500k" value="/data/selftests/x86_64/futex_requeue_pi -o -t 500000" />
<option name="test-command-line" key="kselftest_futex_requeue_pi_bl_2G" value="/data/selftests/x86_64/futex_requeue_pi -b -l -t 2000000000" />
<option name="test-command-line" key="kselftest_futex_requeue_pi_l_2G" value="/data/selftests/x86_64/futex_requeue_pi -l -t 2000000000" />
<option name="test-command-line" key="kselftest_futex_requeue_pi_mismatched_ops" value="/data/selftests/x86_64/futex_requeue_pi_mismatched_ops" />
<option name="test-command-line" key="kselftest_futex_requeue_pi_signal_restart" value="/data/selftests/x86_64/futex_requeue_pi_signal_restart" />
<option name="test-command-line" key="kselftest_futex_wait_timeout" value="/data/selftests/x86_64/futex_wait_timeout" />
<option name="test-command-line" key="kselftest_futex_wait_wouldblock" value="/data/selftests/x86_64/futex_wait_wouldblock" />
<option name="test-command-line" key="kselftest_futex_wait_uninitialized_heap" value="/data/selftests/x86_64/futex_wait_uninitialized_heap" />
<option name="test-command-line" key="kselftest_futex_wait_private_mapped_file" value="/data/selftests/x86_64/futex_wait_private_mapped_file" />
<option name="test-command-line" key="kselftest_futex_wait" value="/data/selftests/x86_64/futex_wait" />
<option name="test-command-line" key="kselftest_futex_requeue" value="/data/selftests/x86_64/futex_requeue" />
<option name="test-command-line" key="kselftest_kcmp_kcmp_test" value="/data/selftests/x86_64/kselftest_kcmp_kcmp_test" />
<option name="test-command-line" key="kselftest_ptrace_peeksiginfo" value="/data/selftests/x86_64/kselftest_ptrace_peeksiginfo" />
<option name="test-command-line" key="kselftest_rtc_rtctest" value="/data/selftests/x86_64/kselftest_rtc_rtctest" />