From nobody Mon Mar 09 20:41:24 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fV8782cBnz6TvCM for ; Mon, 09 Mar 2026 20:41:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fV8781fw2z3FBD for ; Mon, 09 Mar 2026 20:41:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773088884; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CTX6Krqe1+ZRfeewM4r3dmvKNQGsNuhMMp6+2R2zv2w=; b=PXiI7rLLt+kwJVnA/7V3bHRP9tRu6F2EX63bfEJ8mnk1Y9FnusY3D4E4RfxXoX8wxYj8Ly 8Gt+b8MaLuhsTEKhGD29c6jD+LP9jiavLISgK/tswBjvd3ZYbrNe6xFAfNZf6l1yTaFblN Sron9au4EBHAj0FmxqwyDbNouxApIiLH5g74Mw5ORdpdGEn5k6x6sMKQAM7vQjjoF6wauI yEFF1hBwoLO2tQMwr3Wne8UGN+7rWLwXZ6l5kHzJIEZT1fIe7eJiR33cdnDE0ZDr0XgKgQ dVdoTn6+ER5SQW5ysILA7nIR7kuYKA2+IQ8eTyLhzPtHg/9Hy1teIf1GsETUlg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773088884; a=rsa-sha256; cv=none; b=E7hXE0lGYnCscRfeplLIc3Bf5P41QRzqok/qAlx3/ajuMJc8gf5n7gt00yK8SH72WV0w2C 2B2wLJgsLBlCXpKKhw2U+YH5ZaiA3VrSAfgbPFktfhyyIErh699A/Vp8CRIB1Ek/Fm4dMw fM5i6fCTLhT//N/MWprN2gWAranz3L1qtDFVpMmftVVFaZJy9h2X2Jcj8vB95qvvr6vcHh f7TitN30sIn/rb0yXX4TZ0xjlNBdtAqEbaG55dW306vfMx+FyRgA+TDX/2Llk0PtdFZ0xk QcHy5m1zMX8Dgr1PfHU3gAk/rnXlvZSxT572aJxeDf3culVatzJBD6kz6fW94A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773088884; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CTX6Krqe1+ZRfeewM4r3dmvKNQGsNuhMMp6+2R2zv2w=; b=uYvpoRJRA9rY38RO1W0hLQ39lV+hwYGwFMurv1FRc3uuOtkt3qz59W7v3PHz5AfSeztVYl qxxG9kXPAk+Qotmr7L93opSahvq2X2uI1Vm+wMVA7/7xItvaFYCG6ClkLZ2AcD3MGa+Ig2 VL4ze5d2gY1QSATF8EcVfIwfRT5ylNNamKT5D5RzgLNnP+YP5vSq4/qp9hJAn0un9ry81H BLC5NrKpNqmPyq/0rEEsij8tMPoLz3BxsAKqWvt3frYwHp4neihGVwkFoyE2o2vEXsK0Vu lKvCR9V0Yab5ER+NBoQ3wtvPYnKXRREK/9mnyfHnlGs+Bg1Woxlu+VTDZj3zQg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fV8781C9Jzhvv for ; Mon, 09 Mar 2026 20:41:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 361d5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Mar 2026 20:41:24 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 48368f702423 - main - system(3): Address test robustness issue List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 48368f702423742b2a7dff7ad3191625e8bf26f0 Auto-Submitted: auto-generated Date: Mon, 09 Mar 2026 20:41:24 +0000 Message-Id: <69af3074.361d5.acc2bce@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=48368f702423742b2a7dff7ad3191625e8bf26f0 commit 48368f702423742b2a7dff7ad3191625e8bf26f0 Author: Dag-Erling Smørgrav AuthorDate: 2026-03-09 20:41:04 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-03-09 20:41:04 +0000 system(3): Address test robustness issue Don't assume that SIGINT and SIGQUIT are set to SIG_DFL at the start of the test. Instead, retrieve their current dispositions and verify that they are restored at the end of the test. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D55709 --- lib/libc/tests/stdlib/system_test.c | 38 ++++++++++++++++++++++++++----------- 1 file changed, 27 insertions(+), 11 deletions(-) diff --git a/lib/libc/tests/stdlib/system_test.c b/lib/libc/tests/stdlib/system_test.c index b6a31583d52d..cb6ecdb28065 100644 --- a/lib/libc/tests/stdlib/system_test.c +++ b/lib/libc/tests/stdlib/system_test.c @@ -92,6 +92,12 @@ system_thread(void *arg) return ((void *)(intptr_t)system(cmd)); } +static inline int +sigcmpset(const sigset_t *a, const sigset_t *b) +{ + return (memcmp(a, b, sizeof(sigset_t))); +} + ATF_TC(system_concurrent); ATF_TC_HEAD(system_concurrent, tc) { @@ -99,7 +105,8 @@ ATF_TC_HEAD(system_concurrent, tc) } ATF_TC_BODY(system_concurrent, tc) { -#define N 3 + enum { N = 3 }; + struct sigaction sigint, sigquit, sigact; sigset_t normset, sigset; pthread_t thr[N]; char fn[8]; @@ -119,8 +126,10 @@ ATF_TC_BODY(system_concurrent, tc) ATF_REQUIRE_EQ(0, symlink(fn, fn)); } - /* Get the current and expected signal mask */ - sigprocmask(0, NULL, &normset); + /* Save the current signal dispositions */ + ATF_REQUIRE_EQ(0, sigaction(SIGINT, NULL, &sigint)); + ATF_REQUIRE_EQ(0, sigaction(SIGINT, NULL, &sigquit)); + ATF_REQUIRE_EQ(0, sigprocmask(0, NULL, &normset)); /* Spawn threads which block on these files */ for (int i = 0; i < N; i++) { @@ -140,10 +149,12 @@ ATF_TC_BODY(system_concurrent, tc) /* Release the locks */ for (int i = 0; i < N; i++) { /* Check the signal dispositions */ - ATF_CHECK_EQ(SIG_IGN, signal(SIGINT, SIG_IGN)); - ATF_CHECK_EQ(SIG_IGN, signal(SIGQUIT, SIG_IGN)); + ATF_REQUIRE_EQ(0, sigaction(SIGQUIT, NULL, &sigact)); + ATF_CHECK_EQ(SIG_IGN, sigact.sa_handler); + ATF_REQUIRE_EQ(0, sigaction(SIGINT, NULL, &sigact)); + ATF_CHECK_EQ(SIG_IGN, sigact.sa_handler); #ifndef PROCMASK_IS_THREADMASK - sigprocmask(0, NULL, &sigset); + ATF_REQUIRE_EQ(0, sigprocmask(0, NULL, &sigset)); ATF_CHECK(sigismember(&sigset, SIGCHLD)); #endif @@ -156,11 +167,16 @@ ATF_TC_BODY(system_concurrent, tc) } /* Check the signal dispositions */ - ATF_CHECK_EQ(SIG_DFL, signal(SIGINT, SIG_DFL)); - ATF_CHECK_EQ(SIG_DFL, signal(SIGQUIT, SIG_DFL)); - sigprocmask(0, NULL, &sigset); - ATF_CHECK_EQ(0, memcmp(&sigset, &normset, sizeof(sigset_t))); -#undef N + ATF_REQUIRE_EQ(0, sigaction(SIGQUIT, NULL, &sigact)); + ATF_CHECK_EQ(sigquit.sa_handler, sigact.sa_handler); + ATF_CHECK_EQ(sigquit.sa_flags, sigact.sa_flags); + ATF_CHECK_EQ(0, sigcmpset(&sigquit.sa_mask, &sigact.sa_mask)); + ATF_REQUIRE_EQ(0, sigaction(SIGINT, NULL, &sigact)); + ATF_CHECK_EQ(sigint.sa_handler, sigact.sa_handler); + ATF_CHECK_EQ(sigint.sa_flags, sigact.sa_flags); + ATF_CHECK_EQ(0, sigcmpset(&sigint.sa_mask, &sigact.sa_mask)); + ATF_REQUIRE_EQ(0, sigprocmask(0, NULL, &sigset)); + ATF_CHECK_EQ(0, sigcmpset(&sigset, &normset)); } ATF_TP_ADD_TCS(tp)