From nobody Tue May 6 07:50:02 2025 X-Original-To: dev-commits-src-main@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 4Zs9Xp6yT4z5vfh7; Tue, 06 May 2025 07:50:02 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zs9Xp2Km6z3WRX; Tue, 06 May 2025 07:50:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746517802; 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=nAjQz1LDaHtz2DZW3G4BhjW/oG9JpaZ3SanXXF8FuQU=; b=J7zeG7Lzd/Xxfbi/iz2wfqrQFVnK0VP6LNfXr7cwMUBkLilZdAkp+0qL25P5JPh/qtK2Is 1stw2N9R9N1wyXvnkFqax3TIE63XL+hrk4p2nQbXZ0rW7aMKAXDpymSOxqNRQTtJzxXDbz BS6nx69jhdAd0EJYq7X0gm99rxFIYePImdF1ztOYPYyee+VGE8P9qnONazLVUPLkkMrHE4 lbbYFj5N/+d2bmG3H7GFA/J2ZzU9/8dWz63NrjiKLrBr4xRfjTefkNOXvv0AgPwQmMgz/a 2i1sPPj3pwikiHiBb9kNDiA2ZXfkrSm4s22fnT5ADI2k6+RHEDuBWYwYAon2ww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746517802; 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=nAjQz1LDaHtz2DZW3G4BhjW/oG9JpaZ3SanXXF8FuQU=; b=PtMu0G2HQjviw8zeQFpRrkwXYtoWOrW94rF2PE2z2nupB5VSZqip8ofv+SkFZL0weeYgpQ DkQwBDljT2B4MwW0HNUBEVYMbbOmd4jvYXsenQrNIZc1AfNXJpVbXtbMXGi7OKhuWEDJM9 iQueVw1lqu+nXoMGZkZRvIbaTuC4i9ejYdYCUUAg8x8vWvOT6y3JTN5mJPQZiPHhVTJFVd SXNOzkkaFPj44ygop1Y/gTO0sCTrzxGiSySJoeXt0UPZHOUgBBoJOyVwg2o/KSIQLgkwJC ware685g5Jt+FdjLuek/bJU9RoReJoPjFUsb5rYtGiRG5K3LAWg2cqU0Tqb5bg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746517802; a=rsa-sha256; cv=none; b=xsIQ13logVA7JeO0JUr2ycvmY42FRJfDWduqzJ3lRo1s7/pXz5ikT+K4MNdpc9iSntDXlZ ohC1GZcTDzDSXHnUBSsDXQ6B0c1TL+H93HO7aae20vxShp/mkpVkEoCptg1C0G0sxWgJZZ YeyjnzcsViABnFntwv6+0Rlx8VJKJPXKGhCgbvw7cmtKvljluJ3kynjcKYk3tRJ4tJXzWP 2mMv2emx6qzPJk26VCGbT+hKegXT/2pJ4XbtcAVKJqGCX8/fWm2xSk0yp1C/f2Ww6MP5eL 5E8HboyLk+NXC071TbysHakP6ui9FPP7nJzUGrbqNd5m0lLWPruT3eyI+ODhbA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Zs9Xp1t7FzrLh; Tue, 06 May 2025 07:50:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5467o2Ol020872; Tue, 6 May 2025 07:50:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5467o268020867; Tue, 6 May 2025 07:50:02 GMT (envelope-from git) Date: Tue, 6 May 2025 07:50:02 GMT Message-Id: <202505060750.5467o268020867@gitrepo.freebsd.org> 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=B8rgrav?= Subject: git: 42fd47ef8113 - main - mail: Further refine the SIGINT test. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 42fd47ef81138ae53ba77add5a400f67af8e6263 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=42fd47ef81138ae53ba77add5a400f67af8e6263 commit 42fd47ef81138ae53ba77add5a400f67af8e6263 Author: Dag-Erling Smørgrav AuthorDate: 2025-05-06 07:49:45 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-05-06 07:49:45 +0000 mail: Further refine the SIGINT test. * Wait at least 1-2 s before sending the second SIGINT. * If the child is still running after 15 s, send a SIGKILL. * Improve the exit status checks. Fixes: 59597032c948 MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D50092 --- usr.bin/mail/tests/mail_sigint_test.c | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/usr.bin/mail/tests/mail_sigint_test.c b/usr.bin/mail/tests/mail_sigint_test.c index e2889493f3cd..ace5f714c459 100644 --- a/usr.bin/mail/tests/mail_sigint_test.c +++ b/usr.bin/mail/tests/mail_sigint_test.c @@ -11,6 +11,7 @@ #include #include #include +#include #include #include @@ -32,6 +33,7 @@ mailx_sigint(bool interactive) char ebuf[1024] = ""; struct pollfd fds[2]; int ipd[2], opd[2], epd[2], spd[2]; + time_t start, now; size_t olen = 0, elen = 0; ssize_t rlen; pid_t pid; @@ -86,25 +88,28 @@ mailx_sigint(bool interactive) fds[0].events = POLLIN; fds[1].fd = epd[0]; fds[1].events = POLLIN; + time(&start); for (;;) { - if (poll(fds, 2, 1000) < 0) - atf_tc_fail("failed to poll"); + ATF_REQUIRE(poll(fds, 2, 1000) >= 0); if (fds[0].revents == POLLIN && olen < sizeof(obuf)) { rlen = read(opd[0], obuf + olen, sizeof(obuf) - olen - 1); - if (rlen < 0) - atf_tc_fail("failed to read"); + ATF_REQUIRE(rlen >= 0); olen += rlen; } if (fds[1].revents == POLLIN && elen < sizeof(ebuf)) { rlen = read(epd[0], ebuf + elen, sizeof(ebuf) - elen - 1); - if (rlen < 0) - atf_tc_fail("failed to read"); + ATF_REQUIRE(rlen >= 0); elen += rlen; } - if (elen > 0 && kc == 1) { - kill(pid, SIGINT); + time(&now); + if (now - start > 1 && elen > 0 && kc == 1) { + ATF_CHECK_INTEQ(0, kill(pid, SIGINT)); kc++; } + if (now - start > 15 && kc > 0) { + (void)kill(pid, SIGKILL); + kc = -1; + } if (waitpid(pid, &status, WNOHANG) == pid) break; } @@ -114,14 +119,16 @@ mailx_sigint(bool interactive) close(spd[0]); if (interactive) { ATF_CHECK(WIFEXITED(status)); - ATF_CHECK_INTEQ(1, WEXITSTATUS(status)); + if (WIFEXITED(status)) + ATF_CHECK_INTEQ(1, WEXITSTATUS(status)); ATF_CHECK_INTEQ(2, kc); ATF_CHECK_STREQ("", obuf); ATF_CHECK_MATCH("Interrupt -- one more to kill letter", ebuf); atf_utils_compare_file("dead.letter", BODY); } else { ATF_CHECK(WIFSIGNALED(status)); - ATF_CHECK_INTEQ(SIGINT, WTERMSIG(status)); + if (WIFSIGNALED(status)) + ATF_CHECK_INTEQ(SIGINT, WTERMSIG(status)); ATF_CHECK_INTEQ(1, kc); ATF_CHECK_STREQ("", obuf); ATF_CHECK_STREQ("", ebuf);