Module Name:    src
Committed By:   jruoho
Date:           Wed Mar 30 17:02:17 UTC 2011

Modified Files:
        src/distrib/sets/lists/tests: mi
        src/tests/lib/libutil: Makefile
Added Files:
        src/tests/lib/libutil: t_efun.c

Log Message:
Add some naive tests for the efun(3) family of debug functions.


To generate a diff of this commit:
cvs rdiff -u -r1.280 -r1.281 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.3 -r1.4 src/tests/lib/libutil/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/lib/libutil/t_efun.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.280 src/distrib/sets/lists/tests/mi:1.281
--- src/distrib/sets/lists/tests/mi:1.280	Wed Mar 30 11:43:15 2011
+++ src/distrib/sets/lists/tests/mi	Wed Mar 30 17:02:17 2011
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.280 2011/03/30 11:43:15 he Exp $
+# $NetBSD: mi,v 1.281 2011/03/30 17:02:17 jruoho Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -499,6 +499,7 @@
 ./usr/libdata/debug/usr/tests/lib/libskey				tests-lib-debug
 ./usr/libdata/debug/usr/tests/lib/libskey/t_algorithms.debug		tests-lib-debug		debug,atf,skey
 ./usr/libdata/debug/usr/tests/lib/libutil				tests-lib-debug
+./usr/libdata/debug/usr/tests/lib/libutil/t_efun.debug			tests-lib-debug		debug,atf
 ./usr/libdata/debug/usr/tests/lib/libutil/t_parsedate.debug		tests-lib-debug		debug,atf
 ./usr/libdata/debug/usr/tests/lib/libutil/t_pidfile.debug		tests-lib-debug		debug,atf
 ./usr/libdata/debug/usr/tests/lib/libutil/t_snprintb.debug		tests-lib-debug		debug,atf
@@ -1986,6 +1987,7 @@
 ./usr/tests/lib/libskey/t_algorithms		tests-lib-tests		atf,skey
 ./usr/tests/lib/libutil				tests-lib-tests		atf
 ./usr/tests/lib/libutil/Atffile			tests-lib-tests		atf
+./usr/tests/lib/libutil/t_efun			tests-lib-tests		atf
 ./usr/tests/lib/libutil/t_parsedate		tests-lib-tests		atf
 ./usr/tests/lib/libutil/t_pidfile		tests-lib-tests		atf
 ./usr/tests/lib/libutil/t_snprintb		tests-lib-tests		atf

Index: src/tests/lib/libutil/Makefile
diff -u src/tests/lib/libutil/Makefile:1.3 src/tests/lib/libutil/Makefile:1.4
--- src/tests/lib/libutil/Makefile:1.3	Tue Mar 22 23:07:32 2011
+++ src/tests/lib/libutil/Makefile	Wed Mar 30 17:02:17 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2011/03/22 23:07:32 jmmv Exp $
+# $NetBSD: Makefile,v 1.4 2011/03/30 17:02:17 jruoho Exp $
 
 NOMAN=		# defined
 
@@ -9,7 +9,8 @@
 DPADD+=		${LIBUTIL}
 LDADD+=		-lutil
 
-TESTS_C=	t_parsedate
+TESTS_C=	t_efun
+TESTS_C+=	t_parsedate
 TESTS_C+=	t_pidfile
 TESTS_C+=	t_snprintb
 TESTS_C+=	t_sockaddr_snprintf

Added files:

Index: src/tests/lib/libutil/t_efun.c
diff -u /dev/null src/tests/lib/libutil/t_efun.c:1.1
--- /dev/null	Wed Mar 30 17:02:17 2011
+++ src/tests/lib/libutil/t_efun.c	Wed Mar 30 17:02:17 2011
@@ -0,0 +1,132 @@
+/*	$NetBSD: t_efun.c,v 1.1 2011/03/30 17:02:17 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 <atf-c.h>
+
+#include <stdint.h>
+#include <stdlib.h>
+#include <util.h>
+
+static bool	fail;
+static void	handler(int, const char *, ...);
+
+static void
+handler(int ef, const char *fmt, ...)
+{
+	fail = false;
+}
+
+ATF_TC(ecalloc);
+ATF_TC_HEAD(ecalloc, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "A basic test of ecalloc(3)");
+}
+
+ATF_TC_BODY(ecalloc, tc)
+{
+	char *x;
+
+	fail = true;
+	x = ecalloc(-1, 1);
+
+	ATF_REQUIRE(x == NULL);
+	ATF_REQUIRE(fail != true);
+
+	fail = true;
+	x = ecalloc(SIZE_MAX, 2);
+
+	ATF_REQUIRE(x == NULL);
+	ATF_REQUIRE(fail != true);
+}
+
+ATF_TC(efopen);
+ATF_TC_HEAD(efopen, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "A basic test of efopen(3)");
+}
+
+ATF_TC_BODY(efopen, tc)
+{
+	FILE *f;
+
+	fail = true;
+	f = efopen("XXX", "XXX");
+
+	ATF_REQUIRE(f == NULL);
+	ATF_REQUIRE(fail != true);
+}
+
+ATF_TC(emalloc);
+ATF_TC_HEAD(emalloc, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "A basic test of emalloc(3)");
+}
+
+ATF_TC_BODY(emalloc, tc)
+{
+	char *x;
+
+	fail = true;
+	x = emalloc(-1);
+
+	ATF_REQUIRE(x == NULL);
+	ATF_REQUIRE(fail != true);
+}
+
+ATF_TC(erealloc);
+ATF_TC_HEAD(erealloc, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "A basic test of erealloc(3)");
+}
+
+ATF_TC_BODY(erealloc, tc)
+{
+	char *x;
+
+	fail = true;
+	x = erealloc(NULL, -1);
+
+	ATF_REQUIRE(x == NULL);
+	ATF_REQUIRE(fail != true);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_REQUIRE(esetfunc(handler) != NULL);
+
+	ATF_TP_ADD_TC(tp, ecalloc);
+	ATF_TP_ADD_TC(tp, efopen);
+	ATF_TP_ADD_TC(tp, emalloc);
+	ATF_TP_ADD_TC(tp, erealloc);
+
+	return atf_no_error();
+}

Reply via email to