Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/tests/lib/libc Move t_mktime and t_strptime to their own ......
details: https://anonhg.NetBSD.org/src/rev/1397c47a91d4
branches: trunk
changeset: 760779:1397c47a91d4
user: pgoyette <pgoyette%NetBSD.org@localhost>
date: Thu Jan 13 00:14:10 2011 +0000
description:
Move t_mktime and t_strptime to their own ..../time/ subdirectory.
(Concurrence from christos@)
diffstat:
tests/lib/libc/Makefile | 6 +-
tests/lib/libc/t_mktime.c | 65 ----------
tests/lib/libc/t_strptime.c | 252 ---------------------------------------
tests/lib/libc/time/Makefile | 10 +
tests/lib/libc/time/t_mktime.c | 65 ++++++++++
tests/lib/libc/time/t_strptime.c | 252 +++++++++++++++++++++++++++++++++++++++
6 files changed, 329 insertions(+), 321 deletions(-)
diffs (truncated from 691 to 300 lines):
diff -r bc3be592231d -r 1397c47a91d4 tests/lib/libc/Makefile
--- a/tests/lib/libc/Makefile Wed Jan 12 23:52:38 2011 +0000
+++ b/tests/lib/libc/Makefile Thu Jan 13 00:14:10 2011 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.31 2011/01/12 19:44:07 pgoyette Exp $
+# $NetBSD: Makefile,v 1.32 2011/01/13 00:14:10 pgoyette Exp $
.include <bsd.own.mk>
.include <bsd.sys.mk>
TESTS_SUBDIRS+= db gen hash ieeefp net regex rpc setjmp stdlib
-TESTS_SUBDIRS+= stdio string sys ttyio
+TESTS_SUBDIRS+= stdio string sys time ttyio
.if ${HAS_SSP} == "yes"
TESTS_SUBDIRS+= ssp
@@ -19,10 +19,8 @@
TESTS_C+= t_gdtoa
TESTS_C+= t_hsearch
TESTS_C+= t_inet
-TESTS_C+= t_mktime
TESTS_C+= t_ptm
TESTS_C+= t_randomid
-TESTS_C+= t_strptime
TESTS_SH+= t_nsdispatch
diff -r bc3be592231d -r 1397c47a91d4 tests/lib/libc/t_mktime.c
--- a/tests/lib/libc/t_mktime.c Wed Jan 12 23:52:38 2011 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,65 +0,0 @@
-/* $NetBSD: t_mktime.c,v 1.1 2011/01/06 17:20:48 pgoyette Exp $ */
-
-/*-
- * Copyright (c) 2011 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by
- *
- * 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 <err.h>
-#include <errno.h>
-#include <string.h>
-#include <time.h>
-
-ATF_TC(mktime);
-
-ATF_TC_HEAD(mktime, tc)
-{
-
- atf_tc_set_md_var(tc, "descr", "Test mktime(3) with negative year");
-}
-
-ATF_TC_BODY(mktime, tc)
-{
- struct tm tms;
-
- (void)memset(&tms, 0, sizeof(tms));
- tms.tm_year = ~0;
-
- errno = 0;
-
- ATF_REQUIRE_ERRNO(errno, mktime(&tms) != (time_t)-1);
-}
-
-ATF_TP_ADD_TCS(tp)
-{
-
- ATF_TP_ADD_TC(tp, mktime);
-
- return atf_no_error();
-}
diff -r bc3be592231d -r 1397c47a91d4 tests/lib/libc/t_strptime.c
--- a/tests/lib/libc/t_strptime.c Wed Jan 12 23:52:38 2011 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,252 +0,0 @@
-/* $NetBSD: t_strptime.c,v 1.1 2010/12/31 14:36:11 pgoyette Exp $ */
-
-/*-
- * Copyright (c) 1998, 2008 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by David Laight.
- *
- * 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>
-__COPYRIGHT("@(#) Copyright (c) 2008\
- The NetBSD Foundation, inc. All rights reserved.");
-__RCSID("$NetBSD: t_strptime.c,v 1.1 2010/12/31 14:36:11 pgoyette Exp $");
-
-#include <time.h>
-
-#include <atf-c.h>
-
-static void
-h_pass(const char *buf, const char *fmt, int len,
- int tm_sec, int tm_min, int tm_hour, int tm_mday,
- int tm_mon, int tm_year, int tm_wday, int tm_yday)
-{
- struct tm tm = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, NULL };
- const char *ret, *exp;
-
- exp = buf + len;
- ret = strptime(buf, fmt, &tm);
-
- ATF_REQUIRE_MSG(ret == exp,
- "strptime(\"%s\", \"%s\", tm): incorrect return code: "
- "expected: %p, got: %p", buf, fmt, exp, ret);
-
-#define H_REQUIRE_FIELD(field) \
- ATF_REQUIRE_MSG(tm.field == field, \
- "strptime(\"%s\", \"%s\", tm): incorrect %s: " \
- "expected: %d, but got: %d", buf, fmt, \
- ___STRING(field), field, tm.field)
-
- H_REQUIRE_FIELD(tm_sec);
- H_REQUIRE_FIELD(tm_min);
- H_REQUIRE_FIELD(tm_hour);
- H_REQUIRE_FIELD(tm_mday);
- H_REQUIRE_FIELD(tm_mon);
- H_REQUIRE_FIELD(tm_year);
- H_REQUIRE_FIELD(tm_wday);
- H_REQUIRE_FIELD(tm_yday);
-
-#undef H_REQUIRE_FIELD
-}
-
-static void
-h_fail(const char *buf, const char *fmt)
-{
- struct tm tm = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, NULL };
-
- ATF_REQUIRE_MSG(strptime(buf, fmt, &tm) == NULL, "strptime(\"%s\", "
- "\"%s\", &tm) should fail, but it didn't", buf, fmt);
-}
-
-ATF_TC(common);
-
-ATF_TC_HEAD(common, tc)
-{
-
- atf_tc_set_md_var(tc, "descr", "Checks strptime(3): various checks");
-}
-
-ATF_TC_BODY(common, tc)
-{
-
- h_pass("Tue Jan 20 23:27:46 1998", "%a %b %d %T %Y",
- 24, 46, 27, 23, 20, 0, 98, 2, -1);
- h_pass("Tue Jan 20 23:27:46 1998", "%a %b %d %H:%M:%S %Y",
- 24, 46, 27, 23, 20, 0, 98, 2, -1);
- h_pass("Tue Jan 20 23:27:46 1998", "%c",
- 24, 46, 27, 23, 20, 0, 98, 2, -1);
- h_pass("Fri Mar 4 20:05:34 2005", "%a %b %e %H:%M:%S %Y",
- 24, 34, 5, 20, 4, 2, 105, 5, -1);
- h_pass("5\t3 4 8pm:05:34 2005", "%w%n%m%t%d%n%k%p:%M:%S %Y",
- 21, 34, 5, 20, 4, 2, 105, 5, -1);
- h_pass("Fri Mar 4 20:05:34 2005", "%c",
- 24, 34, 5, 20, 4, 2, 105, 5, -1);
-
- h_pass("x20y", "x%Cy", 4, -1, -1, -1, -1, -1, 100, -1, -1);
- h_pass("x84y", "x%yy", 4, -1, -1, -1, -1, -1, 84, -1, -1);
- h_pass("x2084y", "x%C%yy", 6, -1, -1, -1, -1, -1, 184, -1, -1);
- h_pass("x8420y", "x%y%Cy", 6, -1, -1, -1, -1, -1, 184, -1, -1);
- h_pass("%20845", "%%%C%y5", 6, -1, -1, -1, -1, -1, 184, -1, -1);
- h_fail("%", "%E%");
-
- h_pass("1980", "%Y", 4, -1, -1, -1, -1, -1, 80, -1, -1);
- h_pass("1980", "%EY", 4, -1, -1, -1, -1, -1, 80, -1, -1);
-
- h_pass("0", "%S", 1, 0, -1, -1, -1, -1, -1, -1, -1);
- h_pass("59", "%S", 2, 59, -1, -1, -1, -1, -1, -1, -1);
- h_pass("60", "%S", 2, 60, -1, -1, -1, -1, -1, -1, -1);
- h_pass("61", "%S", 2, 61, -1, -1, -1, -1, -1, -1, -1);
- h_fail("62", "%S");
-}
-
-ATF_TC(day);
-
-ATF_TC_HEAD(day, tc)
-{
-
- atf_tc_set_md_var(tc, "descr", "Checks strptime(3): day names");
-}
-
-ATF_TC_BODY(day, tc)
-{
-
- h_pass("Sun", "%a", 3, -1, -1, -1, -1, -1, -1, 0, -1);
- h_pass("Sunday", "%a", 6, -1, -1, -1, -1, -1, -1, 0, -1);
- h_pass("Mon", "%a", 3, -1, -1, -1, -1, -1, -1, 1, -1);
- h_pass("Monday", "%a", 6, -1, -1, -1, -1, -1, -1, 1, -1);
- h_pass("Tue", "%a", 3, -1, -1, -1, -1, -1, -1, 2, -1);
- h_pass("Tuesday", "%a", 7, -1, -1, -1, -1, -1, -1, 2, -1);
- h_pass("Wed", "%a", 3, -1, -1, -1, -1, -1, -1, 3, -1);
- h_pass("Wednesday", "%a", 9, -1, -1, -1, -1, -1, -1, 3, -1);
- h_pass("Thu", "%a", 3, -1, -1, -1, -1, -1, -1, 4, -1);
- h_pass("Thursday", "%a", 8, -1, -1, -1, -1, -1, -1, 4, -1);
- h_pass("Fri", "%a", 3, -1, -1, -1, -1, -1, -1, 5, -1);
- h_pass("Friday", "%a", 6, -1, -1, -1, -1, -1, -1, 5, -1);
- h_pass("Sat", "%a", 3, -1, -1, -1, -1, -1, -1, 6, -1);
- h_pass("Saturday", "%a", 8, -1, -1, -1, -1, -1, -1, 6, -1);
- h_pass("Saturn", "%a", 3, -1, -1, -1, -1, -1, -1, 6, -1);
- h_fail("Moon", "%a");
- h_pass("Sun", "%A", 3, -1, -1, -1, -1, -1, -1, 0, -1);
- h_pass("Sunday", "%A", 6, -1, -1, -1, -1, -1, -1, 0, -1);
- h_pass("Mon", "%A", 3, -1, -1, -1, -1, -1, -1, 1, -1);
- h_pass("Monday", "%A", 6, -1, -1, -1, -1, -1, -1, 1, -1);
- h_pass("Tue", "%A", 3, -1, -1, -1, -1, -1, -1, 2, -1);
- h_pass("Tuesday", "%A", 7, -1, -1, -1, -1, -1, -1, 2, -1);
- h_pass("Wed", "%A", 3, -1, -1, -1, -1, -1, -1, 3, -1);
- h_pass("Wednesday", "%A", 9, -1, -1, -1, -1, -1, -1, 3, -1);
- h_pass("Thu", "%A", 3, -1, -1, -1, -1, -1, -1, 4, -1);
- h_pass("Thursday", "%A", 8, -1, -1, -1, -1, -1, -1, 4, -1);
- h_pass("Fri", "%A", 3, -1, -1, -1, -1, -1, -1, 5, -1);
- h_pass("Friday", "%A", 6, -1, -1, -1, -1, -1, -1, 5, -1);
- h_pass("Sat", "%A", 3, -1, -1, -1, -1, -1, -1, 6, -1);
- h_pass("Saturday", "%A", 8, -1, -1, -1, -1, -1, -1, 6, -1);
- h_pass("Saturn", "%A", 3, -1, -1, -1, -1, -1, -1, 6, -1);
- h_fail("Moon", "%A");
-
- h_pass("mon", "%a", 3, -1, -1, -1, -1, -1, -1, 1, -1);
- h_pass("tueSDay", "%A", 7, -1, -1, -1, -1, -1, -1, 2, -1);
- h_pass("sunday", "%A", 6, -1, -1, -1, -1, -1, -1, 0, -1);
- h_fail("sunday", "%EA");
- h_pass("SaturDay", "%A", 8, -1, -1, -1, -1, -1, -1, 6, -1);
- h_fail("SaturDay", "%OA");
-}
-
-ATF_TC(month);
-
-ATF_TC_HEAD(month, tc)
-{
-
- atf_tc_set_md_var(tc, "descr", "Checks strptime(3): month names");
-}
-
-ATF_TC_BODY(month, tc)
-{
-
- h_pass("Jan", "%b", 3, -1, -1, -1, -1, 0, -1, -1, -1);
- h_pass("January", "%b", 7, -1, -1, -1, -1, 0, -1, -1, -1);
- h_pass("Feb", "%b", 3, -1, -1, -1, -1, 1, -1, -1, -1);
- h_pass("February", "%b", 8, -1, -1, -1, -1, 1, -1, -1, -1);
- h_pass("Mar", "%b", 3, -1, -1, -1, -1, 2, -1, -1, -1);
- h_pass("March", "%b", 5, -1, -1, -1, -1, 2, -1, -1, -1);
- h_pass("Apr", "%b", 3, -1, -1, -1, -1, 3, -1, -1, -1);
- h_pass("April", "%b", 5, -1, -1, -1, -1, 3, -1, -1, -1);
- h_pass("May", "%b", 3, -1, -1, -1, -1, 4, -1, -1, -1);
- h_pass("Jun", "%b", 3, -1, -1, -1, -1, 5, -1, -1, -1);
- h_pass("June", "%b", 4, -1, -1, -1, -1, 5, -1, -1, -1);
- h_pass("Jul", "%b", 3, -1, -1, -1, -1, 6, -1, -1, -1);
- h_pass("July", "%b", 4, -1, -1, -1, -1, 6, -1, -1, -1);
- h_pass("Aug", "%b", 3, -1, -1, -1, -1, 7, -1, -1, -1);
Home |
Main Index |
Thread Index |
Old Index