When using the TEST_HARNESS_MAIN macro definition to declare the main
function, you need to use the EXPECT_ and ASSERT_ series of functions in
conjunction. Otherwise, even if a test item fails, the test will still
return a success result.
When adding a delay in waiterfn to artificially create an incorrect test
result, the test item has actually failed. However, the output still
indicates that the test has passed:
TAP version 13
1..2
Starting 2 tests from 1 test cases.
RUN global.requeue_single ...
not ok 1 futex_requeue simple returned: 0
not ok 2 futex_requeue simple returned: 0
OK global.requeue_single
ok 1 global.requeue_single
RUN global.requeue_multiple ...
not ok 2 futex_requeue many returned: 0 Success
not ok 3 futex_requeue many returned: 0 Success
OK global.requeue_multiple
ok 2 global.requeue_multiple
PASSED: 2 / 2 tests passed.
Totals: pass:2 fail:0 xfail:0 xpass:0 skip:0 error:0
Fixes: f341a20f6d7e ("selftests/futex: Refactor futex_requeue with
kselftest_harness.h")
Signed-off-by: Yuwen Chen <[email protected]>
---
.../futex/functional/futex_requeue.c | 47 ++++---------------
1 file changed, 8 insertions(+), 39 deletions(-)
diff --git a/tools/testing/selftests/futex/functional/futex_requeue.c
b/tools/testing/selftests/futex/functional/futex_requeue.c
index a9d96105134d0..b468411386dd5 100644
--- a/tools/testing/selftests/futex/functional/futex_requeue.c
+++ b/tools/testing/selftests/futex/functional/futex_requeue.c
@@ -62,7 +62,7 @@ TEST(requeue_single)
volatile futex_t f2 = 0;
pthread_t waiter[10];
atomic_int tid = 0;
- int res, state, retry = 100;
+ int state, retry = 100;
f1 = &_f1;
pthread_barrier_init(&barrier, NULL, 2);
@@ -70,8 +70,7 @@ TEST(requeue_single)
/*
* Requeue a waiter from f1 to f2, and wake f2.
*/
- if (pthread_create(&waiter[0], NULL, waiterfn, &tid))
- ksft_exit_fail_msg("pthread_create failed\n");
+ ASSERT_EQ(0, pthread_create(&waiter[0], NULL, waiterfn, &tid));
pthread_barrier_wait(&barrier);
pthread_barrier_destroy(&barrier);
@@ -82,22 +81,8 @@ TEST(requeue_single)
break;
}
- 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)
@@ -106,7 +91,7 @@ TEST(requeue_multiple)
volatile futex_t f2 = 0;
pthread_t waiter[10];
atomic_int tids[10] = {0};
- int res, i, state, retry = 0;
+ int i, state, retry = 0;
f1 = &_f1;
@@ -117,8 +102,7 @@ TEST(requeue_multiple)
for (i = 0; i < 10; i++) {
pthread_barrier_init(&barrier, NULL, 2);
- if (pthread_create(&waiter[i], NULL, waiterfn, &tids[i]))
- ksft_exit_fail_msg("pthread_create failed\n");
+ ASSERT_EQ(0, pthread_create(&waiter[i], NULL, waiterfn,
&tids[i]));
pthread_barrier_wait(&barrier);
pthread_barrier_destroy(&barrier);
@@ -132,23 +116,8 @@ TEST(requeue_multiple)
}
}
- 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
--
2.34.1
