Module Name: src
Committed By: riastradh
Date: Sat Jan 18 07:05:15 UTC 2025
Modified Files:
src/tests/lib/libc/sys: t_futex_ops.c
Log Message:
tests/lib/libc/sys/t_futex_ops: Fix another FUTEX_CMP_REQUEUE case.
PR kern/56828: futex calls in Linux emulation sometimes hang
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/tests/lib/libc/sys/t_futex_ops.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/lib/libc/sys/t_futex_ops.c
diff -u src/tests/lib/libc/sys/t_futex_ops.c:1.7 src/tests/lib/libc/sys/t_futex_ops.c:1.8
--- src/tests/lib/libc/sys/t_futex_ops.c:1.7 Sat Jan 18 06:22:56 2025
+++ src/tests/lib/libc/sys/t_futex_ops.c Sat Jan 18 07:05:15 2025
@@ -1,4 +1,4 @@
-/* $NetBSD: t_futex_ops.c,v 1.7 2025/01/18 06:22:56 riastradh Exp $ */
+/* $NetBSD: t_futex_ops.c,v 1.8 2025/01/18 07:05:15 riastradh Exp $ */
/*-
* Copyright (c) 2019, 2020 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
#include <sys/cdefs.h>
__COPYRIGHT("@(#) Copyright (c) 2019, 2020\
The NetBSD Foundation, inc. All rights reserved.");
-__RCSID("$NetBSD: t_futex_ops.c,v 1.7 2025/01/18 06:22:56 riastradh Exp $");
+__RCSID("$NetBSD: t_futex_ops.c,v 1.8 2025/01/18 07:05:15 riastradh Exp $");
#include <sys/fcntl.h>
#include <sys/mman.h>
@@ -825,8 +825,11 @@ do_futex_requeue_test(int flags, int op)
*/
/* Move all waiters from 0 to 1. */
- ATF_REQUIRE(__futex(&futex_word, op | flags,
- 0, NULL, &futex_word1, INT_MAX, good_val3) == 0);
+ atf_tc_expect_fail("PR kern/56828:"
+ " futex calls in Linux emulation sometimes hang");
+ ATF_CHECK(__futex(&futex_word, op | flags,
+ 0, NULL, &futex_word1, INT_MAX, good_val3) == 4);
+ atf_tc_expect_pass();
/*
* FUTEX 0: 0 LWPs
