From bb8b1926dbff600c40403c58b1031b7e44a11c97 Mon Sep 17 00:00:00 2001 From: riastradh Date: Sat, 18 Jan 2025 07:05:15 +0000 Subject: [PATCH] tests/lib/libc/sys/t_futex_ops: Fix another FUTEX_CMP_REQUEUE case. PR kern/56828: futex calls in Linux emulation sometimes hang --- tests/lib/libc/sys/t_futex_ops.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/tests/lib/libc/sys/t_futex_ops.c b/tests/lib/libc/sys/t_futex_ops.c index 3aed13d68edc..4fec42accf7c 100644 --- a/tests/lib/libc/sys/t_futex_ops.c +++ b/tests/lib/libc/sys/t_futex_ops.c @@ -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 __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 #include @@ -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