Module Name:    src
Committed By:   jruoho
Date:           Mon May  9 06:04:14 UTC 2011

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

Log Message:
Few basic tests for strerror(3).


To generate a diff of this commit:
cvs rdiff -u -r1.332 -r1.333 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.4 -r1.5 src/tests/lib/libc/string/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/lib/libc/string/t_strerror.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.332 src/distrib/sets/lists/tests/mi:1.333
--- src/distrib/sets/lists/tests/mi:1.332	Mon May  9 05:17:12 2011
+++ src/distrib/sets/lists/tests/mi	Mon May  9 06:04:14 2011
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.332 2011/05/09 05:17:12 jruoho Exp $
+# $NetBSD: mi,v 1.333 2011/05/09 06:04:14 jruoho Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -442,8 +442,9 @@
 ./usr/libdata/debug/usr/tests/lib/libc/string/t_memcpy.debug		tests-lib-debug		debug,atf
 ./usr/libdata/debug/usr/tests/lib/libc/string/t_memmem.debug		tests-lib-debug		debug,atf
 ./usr/libdata/debug/usr/tests/lib/libc/string/t_popcount.debug		tests-lib-debug		debug,atf
-./usr/libdata/debug/usr/tests/lib/libc/string/t_string.debug		tests-lib-debug		debug,atf
+./usr/libdata/debug/usr/tests/lib/libc/string/t_strerror.debug		tests-lib-debug		debug,atf
 ./usr/libdata/debug/usr/tests/lib/libc/string/t_stresep.debug		tests-lib-debug		debug,atf
+./usr/libdata/debug/usr/tests/lib/libc/string/t_string.debug		tests-lib-debug		debug,atf
 ./usr/libdata/debug/usr/tests/lib/libc/string/t_swab.debug		tests-lib-debug		debug,atf
 ./usr/libdata/debug/usr/tests/lib/libc/sys				tests-lib-debug
 ./usr/libdata/debug/usr/tests/lib/libc/sys/t_clone.debug		tests-lib-debug		debug,atf
@@ -1946,8 +1947,9 @@
 ./usr/tests/lib/libc/string/t_memcpy		tests-lib-tests		atf
 ./usr/tests/lib/libc/string/t_memmem		tests-lib-tests		atf
 ./usr/tests/lib/libc/string/t_popcount		tests-lib-tests		atf
-./usr/tests/lib/libc/string/t_string		tests-lib-tests		atf
+./usr/tests/lib/libc/string/t_strerror		tests-lib-tests		atf
 ./usr/tests/lib/libc/string/t_stresep		tests-lib-tests		atf
+./usr/tests/lib/libc/string/t_string		tests-lib-tests		atf
 ./usr/tests/lib/libc/string/t_swab		tests-lib-tests		atf
 ./usr/tests/lib/libc/sys			tests-lib-tests
 ./usr/tests/lib/libc/sys/Atffile		tests-lib-tests		atf

Index: src/tests/lib/libc/string/Makefile
diff -u src/tests/lib/libc/string/Makefile:1.4 src/tests/lib/libc/string/Makefile:1.5
--- src/tests/lib/libc/string/Makefile:1.4	Sun Dec 26 13:35:54 2010
+++ src/tests/lib/libc/string/Makefile	Mon May  9 06:04:14 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2010/12/26 13:35:54 pgoyette Exp $
+# $NetBSD: Makefile,v 1.5 2011/05/09 06:04:14 jruoho Exp $
 
 .include <bsd.own.mk>
 
@@ -7,6 +7,7 @@
 TESTS_C+=	t_memcpy
 TESTS_C+=	t_memmem
 TESTS_C+=	t_popcount
+TESTS_C+=	t_strerror
 TESTS_C+=	t_stresep
 TESTS_C+=	t_string
 TESTS_C+=	t_swab

Added files:

Index: src/tests/lib/libc/string/t_strerror.c
diff -u /dev/null src/tests/lib/libc/string/t_strerror.c:1.1
--- /dev/null	Mon May  9 06:04:14 2011
+++ src/tests/lib/libc/string/t_strerror.c	Mon May  9 06:04:14 2011
@@ -0,0 +1,135 @@
+/* $NetBSD: t_strerror.c,v 1.1 2011/05/09 06:04:14 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_strerror.c,v 1.1 2011/05/09 06:04:14 jruoho Exp $");
+
+#include <atf-c.h>
+#include <errno.h>
+#include <limits.h>
+#include <locale.h>
+#include <string.h>
+
+ATF_TC(strerror_basic);
+ATF_TC_HEAD(strerror_basic, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "A basic test of strerror(3)");
+}
+
+ATF_TC(strerror_err);
+ATF_TC_HEAD(strerror_err, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test errors from strerror(3)");
+}
+
+ATF_TC_BODY(strerror_err, tc)
+{
+
+	errno = 0;
+
+	ATF_REQUIRE(strstr(strerror(INT_MAX), "Unknown error:") != NULL);
+	ATF_REQUIRE(errno == EINVAL);
+
+	errno = 0;
+
+	ATF_REQUIRE(strstr(strerror(INT_MIN), "Unknown error:") != NULL);
+	ATF_REQUIRE(errno == EINVAL);
+}
+
+ATF_TC_BODY(strerror_basic, tc)
+{
+	int i;
+
+	for (i = 1; i < sys_nerr; i++)
+		ATF_REQUIRE(strstr(strerror(i), "Unknown error:") == NULL);
+
+	for (; i < sys_nerr + 10; i++)
+		ATF_REQUIRE(strstr(strerror(i), "Unknown error:") != NULL);
+}
+
+ATF_TC(strerror_r_basic);
+ATF_TC_HEAD(strerror_r_basic, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "A basic test of strerrorr_(3)");
+}
+
+ATF_TC_BODY(strerror_r_basic, tc)
+{
+	char buf[512];
+	int i;
+
+	for (i = 1; i < sys_nerr; i++) {
+		ATF_REQUIRE(strerror_r(i, buf, sizeof(buf)) == 0);
+		ATF_REQUIRE(strstr(buf, "Unknown error:") == NULL);
+	}
+
+	for (; i < sys_nerr + 10; i++) {
+		ATF_REQUIRE(strerror_r(i, buf, sizeof(buf)) == EINVAL);
+		ATF_REQUIRE(strstr(buf, "Unknown error:") != NULL);
+	}
+}
+
+ATF_TC(strerror_r_err);
+ATF_TC_HEAD(strerror_r_err, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test errors from strerror_r(3)");
+}
+
+ATF_TC_BODY(strerror_r_err, tc)
+{
+	char buf[512];
+	int rv;
+
+	rv = strerror_r(EPERM, buf, 1);
+	ATF_REQUIRE(rv == ERANGE);
+
+	rv = strerror_r(INT_MAX, buf, sizeof(buf));
+
+	ATF_REQUIRE(rv == EINVAL);
+	ATF_REQUIRE(strstr(buf, "Unknown error:") != NULL);
+
+	rv = strerror_r(INT_MIN, buf, sizeof(buf));
+
+	ATF_REQUIRE(rv == EINVAL);
+	ATF_REQUIRE(strstr(buf, "Unknown error:") != NULL);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	(void)setlocale(LC_ALL, "C");
+
+	ATF_TP_ADD_TC(tp, strerror_basic);
+	ATF_TP_ADD_TC(tp, strerror_err);
+	ATF_TP_ADD_TC(tp, strerror_r_basic);
+	ATF_TP_ADD_TC(tp, strerror_r_err);
+
+	return atf_no_error();
+}

Reply via email to