Message ID | 20230629083546.3031488-1-ricardo.canuelo@collabora.com (mailing list archive) |
---|---|
State | Accepted |
Headers | show |
Series | [RESEND] selftests/mincore: fix skip condition for check_huge_pages test | expand |
On 6/29/23 02:35, Ricardo Cañuelo wrote: > The check_huge_pages test was failing instead of skipping on qemu-armv7 > because the skip condition wasn't handled properly. Add an additional > check to fix it. > > Signed-off-by: Ricardo Cañuelo <ricardo.canuelo@collabora.com> > Reported-by: Naresh Kamboju <naresh.kamboju@linaro.org> > Reported-by: Linux Kernel Functional Testing <lkft@linaro.org> > Reviewed-by: Muhammad Usama Anjum <usama.anjum@collabora.com> > Tested-by: Anders Roxell <anders.roxell@linaro.org> > Closes: https://lore.kernel.org/all/CA+G9fYuoB8Ug8PcTU-YGmemL7_eeEksXFihvxWF6OikD7sK7pA@mail.gmail.com > --- > tools/testing/selftests/mincore/mincore_selftest.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > Thank you for the patch and sorry for the delay due to conference travel and vacation. Will be queued for the next rc. thanks, -- Shuah
diff --git a/tools/testing/selftests/mincore/mincore_selftest.c b/tools/testing/selftests/mincore/mincore_selftest.c index 4c88238fc8f0..6fb3eea5b6ee 100644 --- a/tools/testing/selftests/mincore/mincore_selftest.c +++ b/tools/testing/selftests/mincore/mincore_selftest.c @@ -150,8 +149,8 @@ TEST(check_huge_pages) MAP_PRIVATE | MAP_ANONYMOUS | MAP_HUGETLB, -1, 0); if (addr == MAP_FAILED) { - if (errno == ENOMEM) - SKIP(return, "No huge pages available."); + if (errno == ENOMEM || errno == EINVAL) + SKIP(return, "No huge pages available or CONFIG_HUGETLB_PAGE disabled."); else TH_LOG("mmap error: %s", strerror(errno)); }