selftests/futex: Fix incorrect result reporting of futex_requeue test item

When using the TEST_HARNESS_MAIN macro definition to declare the main
function, it is required to use the EXPECT*() and ASSERT*() macros in
conjunction and not ksft_test_result_*(). Otherwise, even if a test item
fails, the test will still return a success result because
ksft_test_result_*() does not affect the test harness state.

Convert the code to use EXPECT/ASSERT() variants, which ensures that the
overall test result is fail if one of the EXPECT()s fails.

[ tglx: Massaged change log to explain _why_ ksft_test_result*() is the wrong
  	choice ]

Fixes: f341a20f6d7e ("selftests/futex: Refactor futex_requeue with kselftest_harness.h")
Signed-off-by: Yuwen Chen <ywen.chen@foxmail.com>
Signed-off-by: Thomas Gleixner <tglx@kernel.org>
Link: https://patch.msgid.link/tencent_51851B741CC4B5EC9C22AFF70BA82BB60805@qq.com

diff --git a/tools/testing/selftests/futex/functional/futex_requeue.c b/tools/testing/selftests/futex/functional/futex_requeue.c
index 35d4be23db5da68d0be3a092ea8fbda1e45a4d01..dcf0d5f2f31227f5fc21ad40a74444303a099a24 100644 (file)
--- a/tools/testing/selftests/futex/functional/futex_requeue.c
+++ b/tools/testing/selftests/futex/functional/futex_requeue.c
@@ -34,34 +34,18 @@ TEST(requeue_single)
        volatile futex_t _f1 = 0;
        volatile futex_t f2 = 0;
        pthread_t waiter[10];
-       int res;
 
        f1 = &_f1;
 
        /*
         * Requeue a waiter from f1 to f2, and wake f2.
         */
-       if (pthread_create(&waiter[0], NULL, waiterfn, NULL))
-               ksft_exit_fail_msg("pthread_create failed\n");
+       ASSERT_EQ(0, pthread_create(&waiter[0], NULL, waiterfn, NULL));
 
        usleep(WAKE_WAIT_US);
 
-       ksft_print_dbg_msg("Requeuing 1 futex from f1 to f2\n");
-       res = futex_cmp_requeue(f1, 0, &f2, 0, 1, 0);
-       if (res != 1)
-               ksft_test_result_fail("futex_requeue simple returned: %d %s\n",
-                                     res ? errno : res,
-                                     res ? strerror(errno) : "");
-
-       ksft_print_dbg_msg("Waking 1 futex at f2\n");
-       res = futex_wake(&f2, 1, 0);
-       if (res != 1) {
-               ksft_test_result_fail("futex_requeue simple returned: %d %s\n",
-                                     res ? errno : res,
-                                     res ? strerror(errno) : "");
-       } else {
-               ksft_test_result_pass("futex_requeue simple succeeds\n");
-       }
+       EXPECT_EQ(1, futex_cmp_requeue(f1, 0, &f2, 0, 1, 0));
+       EXPECT_EQ(1, futex_wake(&f2, 1, 0));
 }
 
 TEST(requeue_multiple)
@@ -69,7 +53,7 @@ TEST(requeue_multiple)
        volatile futex_t _f1 = 0;
        volatile futex_t f2 = 0;
        pthread_t waiter[10];
-       int res, i;
+       int i;
 
        f1 = &_f1;
 
@@ -77,30 +61,13 @@ TEST(requeue_multiple)
         * Create 10 waiters at f1. At futex_requeue, wake 3 and requeue 7.
         * At futex_wake, wake INT_MAX (should be exactly 7).
         */
-       for (i = 0; i < 10; i++) {
-               if (pthread_create(&waiter[i], NULL, waiterfn, NULL))
-                       ksft_exit_fail_msg("pthread_create failed\n");
-       }
+       for (i = 0; i < 10; i++)
+               ASSERT_EQ(0, pthread_create(&waiter[i], NULL, waiterfn, NULL));
 
        usleep(WAKE_WAIT_US);
 
-       ksft_print_dbg_msg("Waking 3 futexes at f1 and requeuing 7 futexes from f1 to f2\n");
-       res = futex_cmp_requeue(f1, 0, &f2, 3, 7, 0);
-       if (res != 10) {
-               ksft_test_result_fail("futex_requeue many returned: %d %s\n",
-                                     res ? errno : res,
-                                     res ? strerror(errno) : "");
-       }
-
-       ksft_print_dbg_msg("Waking INT_MAX futexes at f2\n");
-       res = futex_wake(&f2, INT_MAX, 0);
-       if (res != 7) {
-               ksft_test_result_fail("futex_requeue many returned: %d %s\n",
-                                     res ? errno : res,
-                                     res ? strerror(errno) : "");
-       } else {
-               ksft_test_result_pass("futex_requeue many succeeds\n");
-       }
+       EXPECT_EQ(10, futex_cmp_requeue(f1, 0, &f2, 3, 7, 0));
+       EXPECT_EQ(7, futex_wake(&f2, INT_MAX, 0));
 }
 
 TEST_HARNESS_MAIN