diff options
| author | Edward Liaw <edliaw@google.com> | 2022-03-25 23:48:18 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-03-25 23:48:18 +0000 |
| commit | 352f45c2af295475bc9898fd78c26a90e0f4f1ba (patch) | |
| tree | 1ae7133f2a9dfced81fa9d035bc994a48faa429c | |
| parent | 4061ce1e065c85e401493404a2cc997ccd9c1f4f (diff) | |
| parent | 0a732eeabe418c364b5ab41acbce6cb96d7b9259 (diff) | |
| download | linux-kselftest-352f45c2af295475bc9898fd78c26a90e0f4f1ba.tar.gz | |
selftests: userfaultfd skip if unavailable am: b63639e78f am: 609d8fab75 am: 535c74393f am: 0a732eeabe
Original change: https://android-review.googlesource.com/c/platform/external/linux-kselftest/+/2041084
Change-Id: Ic9582715433556e7ab0037ffdbdd95c9a89dab4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | android/patches/0025-selftests-userfaultfd-skip-if-unavailable.patch | 33 | ||||
| -rw-r--r-- | tools/testing/selftests/vm/userfaultfd.c | 2 |
2 files changed, 34 insertions, 1 deletions
diff --git a/android/patches/0025-selftests-userfaultfd-skip-if-unavailable.patch b/android/patches/0025-selftests-userfaultfd-skip-if-unavailable.patch new file mode 100644 index 000000000000..0920fb307ed0 --- /dev/null +++ b/android/patches/0025-selftests-userfaultfd-skip-if-unavailable.patch @@ -0,0 +1,33 @@ +From 30c060a86f0e56c19e18ade48c0ee7592edfc317 Mon Sep 17 00:00:00 2001 +From: Edward Liaw <edliaw@google.com> +Date: Thu, 24 Mar 2022 00:29:56 +0000 +Subject: [PATCH] selftests: userfaultfd skip if unavailable + +Skip userfaultfd selftest if the syscall is not available for this +kernel. + +Bug: 207175332 +Bug: 206503000 +Test: atest vts_linux_kselftest_arm_64:vm_userfaultfd_shmem_arm_64 +Change-Id: I60e4d6cc5b3886048ffa1995e4b090f6fbe26b3d +Signed-off-by: Edward Liaw <edliaw@google.com> +--- + tools/testing/selftests/vm/userfaultfd.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tools/testing/selftests/vm/userfaultfd.c b/tools/testing/selftests/vm/userfaultfd.c +index ffc78f3..17947fe 100644 +--- a/tools/testing/selftests/vm/userfaultfd.c ++++ b/tools/testing/selftests/vm/userfaultfd.c +@@ -665,7 +665,7 @@ static int userfaultfd_open(int features) + if (errno == ENOSYS) { + fprintf(stderr, + "userfaultfd syscall not available in this kernel\n"); +- exit(KSFT_PASS); ++ exit(KSFT_SKIP); + } + fprintf(stderr, + "userfaultfd syscall failed with errno: %d\n", errno); +-- +2.35.1.1021.g381101b075-goog + diff --git a/tools/testing/selftests/vm/userfaultfd.c b/tools/testing/selftests/vm/userfaultfd.c index ffc78f3e4444..17947feb6d8e 100644 --- a/tools/testing/selftests/vm/userfaultfd.c +++ b/tools/testing/selftests/vm/userfaultfd.c @@ -665,7 +665,7 @@ static int userfaultfd_open(int features) if (errno == ENOSYS) { fprintf(stderr, "userfaultfd syscall not available in this kernel\n"); - exit(KSFT_PASS); + exit(KSFT_SKIP); } fprintf(stderr, "userfaultfd syscall failed with errno: %d\n", errno); |