CVS commit: src/tests/lib/libc/stdio

[Jukka Ruohonen]

Module Name:    src
Committed By:   jruoho
Date:           Mon Sep 12 04:23:30 UTC 2011

Modified Files:
        src/tests/lib/libc/stdio: t_fopen.c

Log Message:
Add one more case. Also remove a double fclose(3) and do not
steal stderr(3) as atf(7) may use it in case of failures.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/lib/libc/stdio/t_fopen.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/tests/lib/libc/stdio/t_fopen.c
diff -u src/tests/lib/libc/stdio/t_fopen.c:1.1 src/tests/lib/libc/stdio/t_fopen.c:1.2
--- src/tests/lib/libc/stdio/t_fopen.c:1.1	Sun Sep 11 07:31:20 2011
+++ src/tests/lib/libc/stdio/t_fopen.c	Mon Sep 12 04:23:29 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: t_fopen.c,v 1.1 2011/09/11 07:31:20 jruoho Exp $ */
+/*	$NetBSD: t_fopen.c,v 1.2 2011/09/12 04:23:29 jruoho Exp $ */
 
 /*-
  * Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: t_fopen.c,v 1.1 2011/09/11 07:31:20 jruoho Exp $");
+__RCSID("$NetBSD: t_fopen.c,v 1.2 2011/09/12 04:23:29 jruoho Exp $");
 
 #include <atf-c.h>
 #include <errno.h>
@@ -42,6 +42,39 @@
 
 static const char *path = "fopen";
 
+ATF_TC_WITH_CLEANUP(fdopen_close);
+ATF_TC_HEAD(fdopen_close, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "See that descriptors are closed");
+}
+
+ATF_TC_BODY(fdopen_close, tc)
+{
+	FILE *f;
+	int fd;
+
+	/*
+	 * Check that the file descriptor
+	 * used to fdopen(3) a stream is
+	 * closed once the stream is closed.
+	 */
+	fd = open(path, O_RDWR | O_CREAT);
+
+	ATF_REQUIRE(fd >= 0);
+
+	f = fdopen(fd, "w+");
+
+	ATF_REQUIRE(f != NULL);
+	ATF_REQUIRE(fclose(f) == 0);
+	ATF_REQUIRE(close(fd) == -1);
+	ATF_REQUIRE(unlink(path) == 0);
+}
+
+ATF_TC_CLEANUP(fdopen_close, tc)
+{
+	(void)unlink(path);
+}
+
 ATF_TC_WITH_CLEANUP(fdopen_err);
 ATF_TC_HEAD(fdopen_err, tc)
 {
@@ -104,10 +137,7 @@
 	ATF_REQUIRE(f != NULL);
 	ATF_REQUIRE(ftell(f) == 3);
 	ATF_REQUIRE(fclose(f) == 0);
-
-	(void)fclose(f);
-	(void)close(fd);
-	(void)unlink(path);
+	ATF_REQUIRE(unlink(path) == 0);
 }
 
 ATF_TC_CLEANUP(fdopen_seek, tc)
@@ -192,10 +222,12 @@
 	ATF_REQUIRE(fclose(f) == 0);
 
 	f = fopen(path, "a");
+
 	ATF_REQUIRE(fwrite("garbage", 1, 7, f) == 7);
 	ATF_REQUIRE(fclose(f) == 0);
 
 	f = fopen(path, "r");
+
 	ATF_REQUIRE(fread(buf, 1, sizeof(buf), f) == 14);
 	ATF_REQUIRE(strncmp(buf, "garbagegarbage", 14) == 0);
 
@@ -351,7 +383,7 @@
 
 ATF_TC_BODY(freopen_std, tc)
 {
-	FILE *std[3] = { stdin, stdout, stderr };
+	FILE *std[2] = { stdin, stdout };
 	char buf[15];
 	size_t i;
 	FILE *f;
@@ -395,6 +427,7 @@
 ATF_TP_ADD_TCS(tp)
 {
 
+	ATF_TP_ADD_TC(tp, fdopen_close);
 	ATF_TP_ADD_TC(tp, fdopen_err);
 	ATF_TP_ADD_TC(tp, fdopen_seek);
 	ATF_TP_ADD_TC(tp, fopen_append);