Module Name:    src
Committed By:   jruoho
Date:           Sun Sep 11 09:02:46 UTC 2011

Modified Files:
        src/distrib/sets/lists/tests: mi
        src/tests/lib/libc/stdio: Makefile
Added Files:
        src/tests/lib/libc/stdio: t_fputc.c

Log Message:
Naive tests for the naive putc(3) family.


To generate a diff of this commit:
cvs rdiff -u -r1.380 -r1.381 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.7 -r1.8 src/tests/lib/libc/stdio/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/lib/libc/stdio/t_fputc.c

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

Modified files:

Index: src/distrib/sets/lists/tests/mi
diff -u src/distrib/sets/lists/tests/mi:1.380 src/distrib/sets/lists/tests/mi:1.381
--- src/distrib/sets/lists/tests/mi:1.380	Sun Sep 11 07:31:20 2011
+++ src/distrib/sets/lists/tests/mi	Sun Sep 11 09:02:45 2011
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.380 2011/09/11 07:31:20 jruoho Exp $
+# $NetBSD: mi,v 1.381 2011/09/11 09:02:45 jruoho Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -439,6 +439,7 @@
 ./usr/libdata/debug/usr/tests/lib/libc/stdio/t_fflush.debug		tests-lib-debug		debug,atf
 ./usr/libdata/debug/usr/tests/lib/libc/stdio/t_fmemopen.debug		tests-lib-debug		debug,atf
 ./usr/libdata/debug/usr/tests/lib/libc/stdio/t_fopen.debug		tests-lib-debug		debug,atf
+./usr/libdata/debug/usr/tests/lib/libc/stdio/t_fputc.debug		tests-lib-debug		debug,atf
 ./usr/libdata/debug/usr/tests/lib/libc/stdio/t_format.debug		tests-obsolete		obsolete
 ./usr/libdata/debug/usr/tests/lib/libc/stdio/t_popen.debug		tests-lib-debug		debug,atf
 ./usr/libdata/debug/usr/tests/lib/libc/stdio/t_printf.debug		tests-lib-debug		debug,atf
@@ -2025,6 +2026,7 @@
 ./usr/tests/lib/libc/stdio/t_fflush		tests-lib-tests		atf
 ./usr/tests/lib/libc/stdio/t_fmemopen		tests-lib-tests		atf
 ./usr/tests/lib/libc/stdio/t_fopen		tests-lib-tests		atf
+./usr/tests/lib/libc/stdio/t_fputc		tests-lib-tests		atf
 ./usr/tests/lib/libc/stdio/t_format		tests-obsolete		obsolete
 ./usr/tests/lib/libc/stdio/t_popen		tests-lib-tests		atf
 ./usr/tests/lib/libc/stdio/t_printf		tests-lib-tests		atf

Index: src/tests/lib/libc/stdio/Makefile
diff -u src/tests/lib/libc/stdio/Makefile:1.7 src/tests/lib/libc/stdio/Makefile:1.8
--- src/tests/lib/libc/stdio/Makefile:1.7	Sun Sep 11 07:31:20 2011
+++ src/tests/lib/libc/stdio/Makefile	Sun Sep 11 09:02:46 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2011/09/11 07:31:20 jruoho Exp $
+# $NetBSD: Makefile,v 1.8 2011/09/11 09:02:46 jruoho Exp $
 
 .include <bsd.own.mk>
 
@@ -8,6 +8,7 @@
 TESTS_C+=	t_fflush
 TESTS_C+=	t_fmemopen
 TESTS_C+=	t_fopen
+TESTS_C+=	t_fputc
 TESTS_C+=	t_popen
 TESTS_C+=	t_printf
 TESTS_C+=	t_scanf

Added files:

Index: src/tests/lib/libc/stdio/t_fputc.c
diff -u /dev/null src/tests/lib/libc/stdio/t_fputc.c:1.1
--- /dev/null	Sun Sep 11 09:02:46 2011
+++ src/tests/lib/libc/stdio/t_fputc.c	Sun Sep 11 09:02:46 2011
@@ -0,0 +1,194 @@
+/*	$NetBSD: t_fputc.c,v 1.1 2011/09/11 09:02:46 jruoho Exp $ */
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jukka Ruohonen.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: t_fputc.c,v 1.1 2011/09/11 09:02:46 jruoho Exp $");
+
+#include <atf-c.h>
+#include <errno.h>
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+
+static const char	*path = "fputc";
+static void		 puterr(int (*)(int, FILE *));
+static void		 putstr(int (*)(int, FILE *));
+
+static void
+puterr(int (*func)(int, FILE *))
+{
+	FILE *f;
+
+	f = fopen(path, "w+");
+
+	ATF_REQUIRE(f != NULL);
+	ATF_REQUIRE(fclose(f) == 0);
+	ATF_REQUIRE(unlink(path) == 0);
+	ATF_REQUIRE(func('x', f) == EOF);
+}
+
+static void
+putstr(int (*func)(int, FILE *))
+{
+	const char *str = "1234567890x";
+	unsigned short i = 0;
+	char buf[10];
+	FILE *f;
+
+	(void)memset(buf, 'x', sizeof(buf));
+
+	f = fopen(path, "w+");
+	ATF_REQUIRE(f != NULL);
+
+	while (str[i] != 'x') {
+		ATF_REQUIRE(func(str[i], f) == str[i]);
+		i++;
+	}
+
+	ATF_REQUIRE(fclose(f) == 0);
+
+	f = fopen(path, "r");
+	ATF_REQUIRE(f != NULL);
+
+	ATF_REQUIRE(fread(buf, 1, 10, f) == 10);
+	ATF_REQUIRE(strncmp(buf, str, 10) == 0);
+
+	ATF_REQUIRE(fclose(f) == 0);
+	ATF_REQUIRE(unlink(path) == 0);
+}
+
+ATF_TC_WITH_CLEANUP(fputc_basic);
+ATF_TC_HEAD(fputc_basic, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "A basic test of fputc(3)");
+}
+
+ATF_TC_BODY(fputc_basic, tc)
+{
+	putstr(fputc);
+}
+
+ATF_TC_CLEANUP(fputc_basic, tc)
+{
+	(void)unlink(path);
+}
+
+ATF_TC_WITH_CLEANUP(fputc_err);
+ATF_TC_HEAD(fputc_err, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test errors from fputc(3)");
+}
+
+ATF_TC_BODY(fputc_err, tc)
+{
+	puterr(fputc);
+}
+
+ATF_TC_CLEANUP(fputc_err, tc)
+{
+	(void)unlink(path);
+}
+
+ATF_TC_WITH_CLEANUP(putc_basic);
+ATF_TC_HEAD(putc_basic, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "A basic test of putc(3)");
+}
+
+ATF_TC_BODY(putc_basic, tc)
+{
+	putstr(putc);
+}
+
+ATF_TC_CLEANUP(putc_basic, tc)
+{
+	(void)unlink(path);
+}
+
+ATF_TC_WITH_CLEANUP(putc_err);
+ATF_TC_HEAD(putc_err, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test errors from putc(3)");
+}
+
+ATF_TC_BODY(putc_err, tc)
+{
+	puterr(putc);
+}
+
+ATF_TC_CLEANUP(putc_err, tc)
+{
+	(void)unlink(path);
+}
+
+ATF_TC_WITH_CLEANUP(putc_unlocked_basic);
+ATF_TC_HEAD(putc_unlocked_basic, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "A basic test of putc_unlocked(3)");
+}
+
+ATF_TC_BODY(putc_unlocked_basic, tc)
+{
+	putstr(putc_unlocked);
+}
+
+ATF_TC_CLEANUP(putc_unlocked_basic, tc)
+{
+	(void)unlink(path);
+}
+
+ATF_TC_WITH_CLEANUP(putc_unlocked_err);
+ATF_TC_HEAD(putc_unlocked_err, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test errors from putc_unlocked(3)");
+}
+
+ATF_TC_BODY(putc_unlocked_err, tc)
+{
+	puterr(putc_unlocked);
+}
+
+ATF_TC_CLEANUP(putc_unlocked_err, tc)
+{
+	(void)unlink(path);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, fputc_basic);
+	ATF_TP_ADD_TC(tp, fputc_err);
+	ATF_TP_ADD_TC(tp, putc_basic);
+	ATF_TP_ADD_TC(tp, putc_err);
+	ATF_TP_ADD_TC(tp, putc_unlocked_basic);
+	ATF_TP_ADD_TC(tp, putc_unlocked_err);
+
+	return atf_no_error();
+}

Reply via email to