In futex_waitv negative tests (invalid_flag, unaligned_address, etc.),
test results were previously evaluated as:
if (res == EINVAL)
Since sys_futex_waitv returns -1 on error and sets errno, direct positive
comparisons against res are always false, causing tests to silently pass
regardless of real errors.
Correct these validations to assert EXPECT_EQ(res, -1) and compare errno
directly against expected constants.
Signed-off-by: Wake Liu <[email protected]>
---
.../selftests/futex/functional/futex_waitv.c | 45 +++++++++----------
1 file changed, 20 insertions(+), 25 deletions(-)
diff --git a/tools/testing/selftests/futex/functional/futex_waitv.c
b/tools/testing/selftests/futex/functional/futex_waitv.c
index 7bed76a1caed..9dc0f9c1f22a 100644
--- a/tools/testing/selftests/futex/functional/futex_waitv.c
+++ b/tools/testing/selftests/futex/functional/futex_waitv.c
@@ -139,11 +139,10 @@ TEST(invalid_flag)
to.tv_sec++;
res = futex_waitv(waitv, NR_FUTEXES, 0, &to, CLOCK_MONOTONIC);
- if (res == EINVAL) {
- EXPECT_TRUE(0) TH_LOG("futex_waitv private returned: %d %s",
- res ? errno : res,
- res ? strerror(errno) : "");
- }
+ EXPECT_EQ(res, -1) TH_LOG("futex_waitv returned unexpected result: %d",
res);
+ if (res == -1)
+ EXPECT_EQ(errno, EINVAL)
+ TH_LOG("futex_waitv returned unexpected errno: %d",
errno);
}
TEST(unaligned_address)
@@ -163,11 +162,10 @@ TEST(unaligned_address)
to.tv_sec++;
res = futex_waitv(waitv, NR_FUTEXES, 0, &to, CLOCK_MONOTONIC);
- if (res == EINVAL) {
- EXPECT_TRUE(0) TH_LOG("futex_wake private returned: %d %s",
- res ? errno : res,
- res ? strerror(errno) : "");
- }
+ EXPECT_EQ(res, -1) TH_LOG("futex_waitv returned unexpected result: %d",
res);
+ if (res == -1)
+ EXPECT_EQ(errno, EINVAL)
+ TH_LOG("futex_waitv returned unexpected errno: %d",
errno);
}
TEST(null_address)
@@ -186,11 +184,10 @@ TEST(null_address)
to.tv_sec++;
res = futex_waitv(waitv, NR_FUTEXES, 0, &to, CLOCK_MONOTONIC);
- if (res == EINVAL) {
- EXPECT_TRUE(0) TH_LOG("futex_waitv private returned: %d %s",
- res ? errno : res,
- res ? strerror(errno) : "");
- }
+ EXPECT_EQ(res, -1) TH_LOG("futex_waitv returned unexpected result: %d",
res);
+ if (res == -1)
+ EXPECT_EQ(errno, EINVAL)
+ TH_LOG("futex_waitv returned unexpected errno: %d",
errno);
/* Testing a NULL address for *waiters */
ASSERT_EQ(clock_gettime(CLOCK_MONOTONIC, &to), 0) TH_LOG("gettime64
failed");
@@ -198,11 +195,10 @@ TEST(null_address)
to.tv_sec++;
res = futex_waitv(NULL, NR_FUTEXES, 0, &to, CLOCK_MONOTONIC);
- if (res == EINVAL) {
- EXPECT_TRUE(0) TH_LOG("futex_waitv private returned: %d %s",
- res ? errno : res,
- res ? strerror(errno) : "");
- }
+ EXPECT_EQ(res, -1) TH_LOG("futex_waitv returned unexpected result: %d",
res);
+ if (res == -1)
+ EXPECT_EQ(errno, EINVAL)
+ TH_LOG("futex_waitv returned unexpected errno: %d",
errno);
}
TEST(invalid_clockid)
@@ -219,11 +215,10 @@ TEST(invalid_clockid)
to.tv_sec++;
res = futex_waitv(NULL, NR_FUTEXES, 0, &to, CLOCK_TAI);
- if (res == EINVAL) {
- EXPECT_TRUE(0) TH_LOG("futex_waitv private returned: %d %s",
- res ? errno : res,
- res ? strerror(errno) : "");
- }
+ EXPECT_EQ(res, -1) TH_LOG("futex_waitv returned unexpected result: %d",
res);
+ if (res == -1)
+ EXPECT_EQ(errno, EINVAL)
+ TH_LOG("futex_waitv returned unexpected errno: %d",
errno);
}
TEST_HARNESS_MAIN
--
2.54.0.746.g67dd491aae-goog
