git: b307799b5141 - main - closefrom_test: Fix the first test
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 23 Oct 2025 19:59:46 UTC
The branch main has been updated by jhb:
URL: https://cgit.FreeBSD.org/src/commit/?id=b307799b5141331effbb93d7f87dd00e9b991982
commit b307799b5141331effbb93d7f87dd00e9b991982
Author: John Baldwin <jhb@FreeBSD.org>
AuthorDate: 2025-10-23 19:59:32 +0000
Commit: John Baldwin <jhb@FreeBSD.org>
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");