From nobody Thu Oct 23 19:59:46 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 4csxhM1DrLz6DNbb; Thu, 23 Oct 2025 19:59:47 +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 4csxhM0fqdz4Fkh; Thu, 23 Oct 2025 19:59:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761249587; 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=zcqtAZVIM0ZGecV459YWq2BGhRvlAfVWroLrFpITGU8=; b=jOj8aUajKOKQqWqTYnH0nbqKgKFif3pqYe73wfq+9Ey++rDwBaohozeBIVeWH+O6yImwCE SwH4Upqs75Wb73Y14kb3dbJJRGsMMVoKSsFC+QKI6vvz9YTrWmpaJM/j1MjINJgJ0ViaXE O/XWSA7VBpKGyy+FURUeWISg4AMi2nk+cW7yn2Oa38Ec0IXiOwJvMTtEA9alyPjLSPksWy 0TxfZl/wijVI2QMUTZO7b7iArCBWKiIFZAdXH/f9CcNqu+4Jy0QgI1WU/WD9rKEmsh+mm4 hP+vna4QMaCl1couomr/u3L930zC2Sy13mX4hQbQ1ikzSolJOjwW/pW7DojWJA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761249587; 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=zcqtAZVIM0ZGecV459YWq2BGhRvlAfVWroLrFpITGU8=; b=GRhpMZR3J1GGJH64eXJIEC8IN/6WJttkYZD2glwpmdzmKUrssEUOh+zPcw73BUD3Cv+KMv fRey2ko08w3YRuAbkT2Ft5Pt+WT0xNW+1V/ePI68vwl03JVCIWf4dMf5dvnOOzgxavTuU0 Tvl3Q4V5pl2/VBGvEMsKTpjy0GfroNYOqCQJIAN1igeCLAR4pNAjXIQ8/S6TgDjgSNevjF WnSxH1ct1MKnlQliaXFFX71TOWVg6s1yosPGGo+FN1H58Vd3134s/fJjr2ZGLPy3HX0rcN rk1BwqPNb2IT8amW0hDSOVwxQkX//jPhsAaXtntIUh0eXWZDqQFAoGJQNhfEwA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761249587; a=rsa-sha256; cv=none; b=VxiyPqWVYhmViP61ZejjlBHvQzHYKDAsfS1+wlqrLX4PgbUwYOtOF+5zgVb9/dByLhGOUH LeU/8mKaUpeszoaWkyCTWpnAQE0MvXZtwehxaNNW+tPKFjlc9F6ZuDHygMohJ4muoCPZ2z cJGau/N96VzI7xOcBaBq7UqiQZjUAofvv5sHoFyUqYoQsxJQkIOle34utK73lPiXyD+bBN KtrVYPScgqXfjVZHXDKFUIBk8xv9Vidk4x67YJtBiw4MUgNdD0pRKf/xtqVhzr0S3hLlq9 PtLMtTgmLdAVIWl2AWj9OokpwFcCBxvkOHprxn3g9HR9DhX8Gi05QqRSWTl/HA== 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 4csxhL6mYXzD9N; Thu, 23 Oct 2025 19:59:46 +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 59NJxkA3012061; Thu, 23 Oct 2025 19:59:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59NJxkm2012058; Thu, 23 Oct 2025 19:59:46 GMT (envelope-from git) Date: Thu, 23 Oct 2025 19:59:46 GMT Message-Id: <202510231959.59NJxkm2012058@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: b307799b5141 - main - closefrom_test: Fix the first 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b307799b5141331effbb93d7f87dd00e9b991982 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=b307799b5141331effbb93d7f87dd00e9b991982 commit b307799b5141331effbb93d7f87dd00e9b991982 Author: John Baldwin AuthorDate: 2025-10-23 19:59:32 +0000 Commit: John Baldwin CommitDate: 2025-10-23 19:59:32 +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 --- 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 7dccf858c772..212d048d7566 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");