From nobody Thu Dec 18 19:13:52 2025 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 4dXL1Y07hjz6LZ9r for ; Thu, 18 Dec 2025 19:13:53 +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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dXL1X6XRtz4M4M for ; Thu, 18 Dec 2025 19:13:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766085232; 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=QskisQZb2yJRyqkInM1cofOpa/jS09Kd1oy0X4EhuZY=; b=roTjsD7pTSs2K1dCKqA1kmfrnDSwPAA+uboUS3cUpHT18zZ4WM6CZ4TOFMCD64SHzvA/8l 1qfSpSmK7x4seWlq1iFSkdjhtZjbh7OYHR3GudKmNMQHlysvq2l2dbQT1b1ZUZMlMKNljW 0ANIeEA5Y6dw5rSBjAgP/+4DshG2FSACFiP+MciRSoOK3vDldPY6VIFfEa0ISMkQb4GhSK 0o5rtxydotF9tS8NvCbZW6/q1ZVnr/IMVG1yOPHAH1m3aPJYtiLUQtPeCLnWd4B3ivDwwt d8HnyNyS1DuqIMdBHGy9StrNnCBwzzpxvzQNn8E7f/z4+5KGUT42MJYbT0oWNQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766085232; 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=QskisQZb2yJRyqkInM1cofOpa/jS09Kd1oy0X4EhuZY=; b=gNFyQqIcTL5s7Zs7WzKBPxhJVaGQ/POlyt/0R5N2yeSvesynDWFwEzythLpHuqPUrU5QtT fAVnc5/KarJZHHnh36VBhpUcDVwm00vd8RBL3JxYyYHVJ4ZkxgyOKsCjIYp64fwIvu2xeQ yENKf1+zZaLtLdh651PwjUm93ttAQ4pFQS5Uw6266A/uGxOYuRwURsWX+PGc1lUOqIvEyZ 1WohLnxin6OWviIxzUF1kz7ykdPYPQbKmjY8AQQQwrgbS7BFJxIko3+pdX1oJVyEsIHLFy f4+iTBvO1uzEt2k1U5P9FeH67p5aQTQlf/k7xQBggh2IbfJzAqSjuM9o6R+3Kg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766085232; a=rsa-sha256; cv=none; b=b84sAGE0w3gXxrQ8U9rJxQIfIQ/dRZG+8dSt7QzVjDCLdKORopasi2e+8EmEYM2Go9Wpj2 QqSJqDve5CWQYtCjA7X/GlJnNDWC/7lmRNISr0VZhueCEUd0y0k8j51njKanbywUyCDgzb H6jiZ4DAcMCn/OrHm2fuHWVGkuIGafyBlgt6ozntKdexJAl6mSlL24ElQzlK2WNuMZUu38 LKtU+zaevZThcServKP2KXfiwtHTNVWMwggpd5BprK0PS/H/MNLULtDQVVNkcuSfJeP3es d0rrToJb5bILrlbCNEuLD1+19xPrO5PhKJmiSHoOrFmhA8jKrU9UFaQIkbCepA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dXL1X6186zrjk for ; Thu, 18 Dec 2025 19:13:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 336c4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 18 Dec 2025 19:13:52 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: ee5ad300a0df - stable/14 - closefrom_test: Fix the first test 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: ee5ad300a0df2e7dceeeda9bff1504c70ad84c69 Auto-Submitted: auto-generated Date: Thu, 18 Dec 2025 19:13:52 +0000 Message-Id: <69445270.336c4.2b528dcd@gitrepo.freebsd.org> The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=ee5ad300a0df2e7dceeeda9bff1504c70ad84c69 commit ee5ad300a0df2e7dceeeda9bff1504c70ad84c69 Author: John Baldwin AuthorDate: 2025-10-23 19:59:32 +0000 Commit: John Baldwin CommitDate: 2025-12-18 18:44:51 +0000 closefrom_test: Fix the first test The first test is supposed to close the new fd, but was instead not closing anything. Reviewed by: ngie, markj Fixes: 3cedbec3ee08 ("Integrate tools/regression/fifo into ...") Differential Revision: https://reviews.freebsd.org/D52799 (cherry picked from commit b307799b5141331effbb93d7f87dd00e9b991982) --- tests/sys/file/closefrom_test.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/sys/file/closefrom_test.c b/tests/sys/file/closefrom_test.c index e30c5eb3d591..e4e4514f74d7 100644 --- a/tests/sys/file/closefrom_test.c +++ b/tests/sys/file/closefrom_test.c @@ -148,7 +148,7 @@ main(void) /* We'd better start up with fd's 0, 1, and 2 open. */ start = devnull(); - if (start == -1) + if (start < 3) fail("open", "bad descriptor %d", start); ok("open"); @@ -159,9 +159,9 @@ main(void) ok("highest_fd"); /* Try to use closefrom() for just closing fd 3. */ - closefrom(start + 1); + closefrom(start); fd = highest_fd(); - if (fd != start) + if (fd != start - 1) fail("closefrom", "highest fd %d", fd); ok("closefrom"); @@ -169,7 +169,7 @@ main(void) for (i = 0; i < 16; i++) (void)devnull(); fd = highest_fd(); - if (fd != start + 16) + if (fd != start + 15) fail("open 16", "highest fd %d", fd); ok("open 16");