svn commit: r290973 - in projects/routing: . contrib/netbsd-tests/lib/libc/gen contrib/netbsd-tests/lib/libc/regex contrib/netbsd-tests/lib/libc/rpc contrib/netbsd-tests/lib/libc/stdio etc etc/mtre...
Alexander V. Chernikov
melifaro at FreeBSD.org
Tue Nov 17 05:41:50 UTC 2015
Author: melifaro
Date: Tue Nov 17 05:41:47 2015
New Revision: 290973
URL: https://svnweb.freebsd.org/changeset/base/290973
Log:
Merge HEAD r290858 to r290867
Added:
projects/routing/lib/libopenbsd/getdtablecount.c
- copied unchanged from r290867, head/lib/libopenbsd/getdtablecount.c
projects/routing/lib/libopenbsd/sys/
- copied from r290867, head/lib/libopenbsd/sys/
projects/routing/lib/libopenbsd/unistd.h
- copied unchanged from r290867, head/lib/libopenbsd/unistd.h
projects/routing/share/ctypedef/ca_IT.ISO8859-1.src
- copied unchanged from r290867, head/share/ctypedef/ca_IT.ISO8859-1.src
projects/routing/share/ctypedef/ja_JP.eucJP.src
- copied unchanged from r290867, head/share/ctypedef/ja_JP.eucJP.src
projects/routing/share/ctypedef/zh_Hans_CN.eucCN.src
- copied unchanged from r290867, head/share/ctypedef/zh_Hans_CN.eucCN.src
projects/routing/share/monetdef/de_AT.ISO8859-1.src
- copied unchanged from r290867, head/share/monetdef/de_AT.ISO8859-1.src
projects/routing/share/monetdef/en_IE.ISO8859-1.src
- copied unchanged from r290867, head/share/monetdef/en_IE.ISO8859-1.src
projects/routing/share/monetdef/nl_NL.ISO8859-1.src
- copied unchanged from r290867, head/share/monetdef/nl_NL.ISO8859-1.src
projects/routing/share/monetdef/sv_FI.ISO8859-1.src
- copied unchanged from r290867, head/share/monetdef/sv_FI.ISO8859-1.src
Deleted:
projects/routing/share/ctypedef/ca_IT.ISO8859-15.src
projects/routing/share/ctypedef/ja_JP.SJIS.src
projects/routing/share/ctypedef/zh_Hans_CN.GB18030.src
projects/routing/share/monetdef/sk_SK.ISO8859-2.src
Modified:
projects/routing/ObsoleteFiles.inc
projects/routing/contrib/netbsd-tests/lib/libc/gen/t_glob.c
projects/routing/contrib/netbsd-tests/lib/libc/regex/debug.c
projects/routing/contrib/netbsd-tests/lib/libc/rpc/t_rpc.c
projects/routing/contrib/netbsd-tests/lib/libc/stdio/t_fopen.c
projects/routing/etc/Makefile
projects/routing/etc/mtree/BSD.usr.dist
projects/routing/lib/libc/tests/Makefile.netbsd-tests
projects/routing/lib/libc/tests/gen/fnmatch_testcases.h
projects/routing/lib/libc/tests/gen/ftw_test.c
projects/routing/lib/libc/tests/gen/popen_test.c
projects/routing/lib/libc/tests/locale/c16rtomb_test.c
projects/routing/lib/libc/tests/locale/iswctype_test.c
projects/routing/lib/libc/tests/locale/mblen_test.c
projects/routing/lib/libc/tests/locale/mbrlen_test.c
projects/routing/lib/libc/tests/locale/mbrtoc16_test.c
projects/routing/lib/libc/tests/locale/mbrtowc_test.c
projects/routing/lib/libc/tests/locale/mbtowc_test.c
projects/routing/lib/libc/tests/stdio/fmemopen2_test.c
projects/routing/lib/libc/tests/stdio/getdelim_test.c
projects/routing/lib/libc/tests/stdio/perror_test.c
projects/routing/lib/libc/tests/stdio/printfloat_test.c
projects/routing/lib/libc/tests/stdio/scanfloat_test.c
projects/routing/lib/libopenbsd/Makefile
projects/routing/share/colldef/Makefile
projects/routing/share/ctypedef/Makefile
projects/routing/share/locale-links/Makefile
projects/routing/share/monetdef/Makefile
projects/routing/share/msgdef/Makefile
projects/routing/share/numericdef/Makefile
projects/routing/share/timedef/Makefile
projects/routing/sys/arm/arm/hdmi_if.m
projects/routing/sys/arm/freescale/imx/imx6_ccm.c
projects/routing/sys/arm/freescale/imx/imx6_ccmreg.h
projects/routing/sys/arm/ti/am335x/am335x_lcd.c
projects/routing/sys/arm/ti/am335x/tda19988.c
projects/routing/sys/dev/ata/chipsets/ata-intel.c
projects/routing/sys/dev/isp/isp_freebsd.c
projects/routing/sys/dev/isp/isp_freebsd.h
projects/routing/sys/kern/kern_jail.c
projects/routing/sys/kern/kern_loginclass.c
projects/routing/sys/kern/kern_racct.c
projects/routing/sys/kern/kern_rctl.c
projects/routing/sys/kern/kern_resource.c
projects/routing/sys/net/route.c
projects/routing/sys/netinet6/in6_fib.c
projects/routing/sys/netinet6/ip6_forward.c
projects/routing/sys/netinet6/nd6.c
projects/routing/sys/netinet6/nd6.h
projects/routing/sys/netpfil/pf/pf.c
projects/routing/sys/sys/jail.h
projects/routing/sys/sys/loginclass.h
projects/routing/sys/sys/resourcevar.h
projects/routing/tools/tools/locale/Makefile
projects/routing/tools/tools/locale/etc/charmaps.xml
projects/routing/tools/tools/locale/tools/cldr2def.pl
Directory Properties:
projects/routing/ (props changed)
projects/routing/lib/libc/ (props changed)
projects/routing/share/ (props changed)
projects/routing/sys/ (props changed)
Modified: projects/routing/ObsoleteFiles.inc
==============================================================================
--- projects/routing/ObsoleteFiles.inc Tue Nov 17 03:34:20 2015 (r290972)
+++ projects/routing/ObsoleteFiles.inc Tue Nov 17 05:41:47 2015 (r290973)
@@ -38,9 +38,52 @@
# xargs -n1 | sort | uniq -d;
# done
+# 20151115: Fox bad upgrade scheme
+OLD_FILES+=usr/share/locale/zh_CN.GB18030/zh_Hans_CN.GB18030
+OLD_FILES+=usr/share/locale/zh_CN.GB2312/zh_Hans_CN.GB2312
+OLD_FILES+=usr/share/locale/zh_CN.GBK/zh_Hans_CN.GBK
+OLD_FILES+=usr/share/locale/zh_CN.UTF-8/zh_Hans_CN.UTF-8
+OLD_FILES+=usr/share/locale/zh_CN.eucCN/zh_Hans_CN.eucCN
+OLD_FILES+=usr/share/locale/zh_TW.Big5/zh_Hant_TW.Big5
+OLD_FILES+=usr/share/locale/zh_TW.UTF-8/zh_Hant_TW.UTF-8
# 20151107: String collation improvements
OLD_FILES+=usr/share/locale/UTF-8/LC_CTYPE
OLD_DIRS+=usr/share/locale/UTF-8
+OLD_FILES+=usr/share/locale/en_CA.ISO8859-15/LC_NUMERIC
+OLD_FILES+=usr/share/locale/en_CA.ISO8859-15/LC_MESSAGES
+OLD_FILES+=usr/share/locale/en_CA.ISO8859-15/LC_TIME
+OLD_FILES+=usr/share/locale/en_CA.ISO8859-15/LC_CTYPE
+OLD_FILES+=usr/share/locale/en_CA.ISO8859-15/LC_COLLATE
+OLD_FILES+=usr/share/locale/en_CA.ISO8859-15/LC_MONETARY
+OLD_DIRS+=usr/share/locale/en_CA.ISO8859-15
+OLD_FILES+=usr/share/locale/en_AU.ISO8859-15/LC_COLLATE
+OLD_FILES+=usr/share/locale/en_AU.ISO8859-15/LC_CTYPE
+OLD_FILES+=usr/share/locale/en_AU.ISO8859-15/LC_MESSAGES
+OLD_FILES+=usr/share/locale/en_AU.ISO8859-15/LC_TIME
+OLD_FILES+=usr/share/locale/en_AU.ISO8859-15/LC_NUMERIC
+OLD_FILES+=usr/share/locale/en_AU.ISO8859-15/LC_MONETARY
+OLD_DIRS+=usr/share/locale/en_AU.ISO8859-15
+OLD_FILES+=usr/share/locale/en_US.ISO8859-15/LC_CTYPE
+OLD_FILES+=usr/share/locale/en_US.ISO8859-15/LC_MESSAGES
+OLD_FILES+=usr/share/locale/en_US.ISO8859-15/LC_COLLATE
+OLD_FILES+=usr/share/locale/en_US.ISO8859-15/LC_TIME
+OLD_FILES+=usr/share/locale/en_US.ISO8859-15/LC_MONETARY
+OLD_FILES+=usr/share/locale/en_US.ISO8859-15/LC_NUMERIC
+OLD_DIRS+=usr/share/locale/en_US.ISO8859-15
+OLD_FILES+=usr/share/locale/en_NZ.ISO8859-15/LC_MESSAGES
+OLD_FILES+=usr/share/locale/en_NZ.ISO8859-15/LC_COLLATE
+OLD_FILES+=usr/share/locale/en_NZ.ISO8859-15/LC_TIME
+OLD_FILES+=usr/share/locale/en_NZ.ISO8859-15/LC_MONETARY
+OLD_FILES+=usr/share/locale/en_NZ.ISO8859-15/LC_NUMERIC
+OLD_FILES+=usr/share/locale/en_NZ.ISO8859-15/LC_CTYPE
+OLD_DIRS+=usr/share/locale/en_NZ.ISO8859-15
+OLD_FILES+=usr/share/locale/fr_CA.ISO8859-15/LC_COLLATE
+OLD_FILES+=usr/share/locale/fr_CA.ISO8859-15/LC_MESSAGES
+OLD_FILES+=usr/share/locale/fr_CA.ISO8859-15/LC_CTYPE
+OLD_FILES+=usr/share/locale/fr_CA.ISO8859-15/LC_TIME
+OLD_FILES+=usr/share/locale/fr_CA.ISO8859-15/LC_NUMERIC
+OLD_FILES+=usr/share/locale/fr_CA.ISO8859-15/LC_MONETARY
+OLD_DIRS+=usr/share/locale/fr_CA.ISO8859-15
OLD_FILES+=usr/share/locale/kk_KZ.PT154/LC_COLLATE
OLD_FILES+=usr/share/locale/kk_KZ.PT154/LC_CTYPE
OLD_FILES+=usr/share/locale/kk_KZ.PT154/LC_MESSAGES
@@ -78,6 +121,13 @@ OLD_FILES+=usr/share/locale/la_LN.US-ASC
OLD_FILES+=usr/share/locale/la_LN.US-ASCII/LC_CTYPE
OLD_FILES+=usr/share/locale/la_LN.US-ASCII/LC_TIME
OLD_DIRS+=usr/share/locale/la_LN.US-ASCII
+OLD_FILES+=usr/share/locale/lt_LT.ISO8859-4/LC_MESSAGES
+OLD_FILES+=usr/share/locale/lt_LT.ISO8859-4/LC_TIME
+OLD_FILES+=usr/share/locale/lt_LT.ISO8859-4/LC_COLLATE
+OLD_FILES+=usr/share/locale/lt_LT.ISO8859-4/LC_MONETARY
+OLD_FILES+=usr/share/locale/lt_LT.ISO8859-4/LC_CTYPE
+OLD_FILES+=usr/share/locale/lt_LT.ISO8859-4/LC_NUMERIC
+OLD_DIRS+=usr/share/locale/lt_LT.ISO8859-4
OLD_FILES+=usr/share/locale/mn_MN.UTF-8/LC_COLLATE
OLD_FILES+=usr/share/locale/mn_MN.UTF-8/LC_CTYPE
OLD_FILES+=usr/share/locale/mn_MN.UTF-8/LC_MESSAGES
@@ -106,6 +156,27 @@ OLD_FILES+=usr/share/locale/no_NO.UTF-8/
OLD_FILES+=usr/share/locale/no_NO.UTF-8/LC_NUMERIC
OLD_FILES+=usr/share/locale/no_NO.UTF-8/LC_TIME
OLD_DIRS+=usr/share/locale/no_NO.UTF-8
+OLD_FILES+=usr/share/locale/sr_YU.ISO8859-2/LC_COLLATE
+OLD_FILES+=usr/share/locale/sr_YU.ISO8859-2/LC_TIME
+OLD_FILES+=usr/share/locale/sr_YU.ISO8859-2/LC_CTYPE
+OLD_FILES+=usr/share/locale/sr_YU.ISO8859-2/LC_MESSAGES
+OLD_FILES+=usr/share/locale/sr_YU.ISO8859-2/LC_NUMERIC
+OLD_FILES+=usr/share/locale/sr_YU.ISO8859-2/LC_MONETARY
+OLD_DIRS+=usr/share/locale/sr_YU.ISO8859-2
+OLD_FILES+=usr/share/locale/sr_YU.ISO8859-5/LC_COLLATE
+OLD_FILES+=usr/share/locale/sr_YU.ISO8859-5/LC_MONETARY
+OLD_FILES+=usr/share/locale/sr_YU.ISO8859-5/LC_NUMERIC
+OLD_FILES+=usr/share/locale/sr_YU.ISO8859-5/LC_CTYPE
+OLD_FILES+=usr/share/locale/sr_YU.ISO8859-5/LC_TIME
+OLD_FILES+=usr/share/locale/sr_YU.ISO8859-5/LC_MESSAGES
+OLD_DIRS+=usr/share/locale/sr_YU.ISO8859-5
+OLD_FILES+=usr/share/locale/sr_YU.UTF-8/LC_COLLATE
+OLD_FILES+=usr/share/locale/sr_YU.UTF-8/LC_MONETARY
+OLD_FILES+=usr/share/locale/sr_YU.UTF-8/LC_CTYPE
+OLD_FILES+=usr/share/locale/sr_YU.UTF-8/LC_TIME
+OLD_FILES+=usr/share/locale/sr_YU.UTF-8/LC_NUMERIC
+OLD_FILES+=usr/share/locale/sr_YU.UTF-8/LC_MESSAGES
+OLD_DIRS+=usr/share/locale/sr_YU.UTF-8
OLD_FILES+=usr/bin/colldef
OLD_FILES+=usr/share/man/man1/colldef.1.gz
OLD_FILES+=usr/bin/mklocale
Modified: projects/routing/contrib/netbsd-tests/lib/libc/gen/t_glob.c
==============================================================================
--- projects/routing/contrib/netbsd-tests/lib/libc/gen/t_glob.c Tue Nov 17 03:34:20 2015 (r290972)
+++ projects/routing/contrib/netbsd-tests/lib/libc/gen/t_glob.c Tue Nov 17 05:41:47 2015 (r290973)
@@ -91,9 +91,11 @@ static struct gl_dir d[] = {
{ "a/b", b, __arraycount(b), 0 },
};
+#ifndef __FreeBSD__
static const char *glob_star[] = {
"a/1", "a/3", "a/4", "a/b", "a/b/w", "a/b/x", "a/b/y", "a/b/z",
};
+#endif
static const char *glob_star_not[] = {
"a/1", "a/3", "a/4", "a/b",
Modified: projects/routing/contrib/netbsd-tests/lib/libc/regex/debug.c
==============================================================================
--- projects/routing/contrib/netbsd-tests/lib/libc/regex/debug.c Tue Nov 17 03:34:20 2015 (r290972)
+++ projects/routing/contrib/netbsd-tests/lib/libc/regex/debug.c Tue Nov 17 05:41:47 2015 (r290973)
@@ -126,11 +126,15 @@ static void
s_print(struct re_guts *g, FILE *d)
{
sop *s;
+#ifdef __NetBSD__
cset *cs;
+#endif
int done = 0;
sop opnd;
int col = 0;
+#ifdef __NetBSD__
ssize_t last;
+#endif
sopno offset = 2;
# define GAP() { if (offset % 5 == 0) { \
if (col > 40) { \
Modified: projects/routing/contrib/netbsd-tests/lib/libc/rpc/t_rpc.c
==============================================================================
--- projects/routing/contrib/netbsd-tests/lib/libc/rpc/t_rpc.c Tue Nov 17 03:34:20 2015 (r290972)
+++ projects/routing/contrib/netbsd-tests/lib/libc/rpc/t_rpc.c Tue Nov 17 05:41:47 2015 (r290973)
@@ -73,8 +73,14 @@ onehost(const char *host, const char *tr
tv.tv_sec = 1;
tv.tv_usec = 0;
+#ifdef __FreeBSD__
+ if (clnt_call(clnt, RPCBPROC_NULL, (xdrproc_t)xdr_void, NULL,
+ (xdrproc_t)xdr_void, NULL, tv)
+ != RPC_SUCCESS)
+#else
if (clnt_call(clnt, RPCBPROC_NULL, xdr_void, NULL, xdr_void, NULL, tv)
!= RPC_SUCCESS)
+#endif
ERRX(EXIT_FAILURE, "clnt_call (%s)", clnt_sperror(clnt, ""));
clnt_control(clnt, CLGET_SVC_ADDR, (char *) &addr);
reply(NULL, &addr, NULL);
Modified: projects/routing/contrib/netbsd-tests/lib/libc/stdio/t_fopen.c
==============================================================================
--- projects/routing/contrib/netbsd-tests/lib/libc/stdio/t_fopen.c Tue Nov 17 03:34:20 2015 (r290972)
+++ projects/routing/contrib/netbsd-tests/lib/libc/stdio/t_fopen.c Tue Nov 17 05:41:47 2015 (r290973)
@@ -303,6 +303,7 @@ ATF_TC_BODY(fopen_perm, tc)
ATF_REQUIRE_ERRNO(EACCES, fopen("/bin/ls", "w+") == NULL);
}
+#ifdef __NetBSD__
ATF_TC(fopen_regular);
ATF_TC_HEAD(fopen_regular, tc)
{
@@ -335,6 +336,7 @@ ATF_TC_BODY(fopen_regular, tc)
}
}
}
+#endif
ATF_TC_WITH_CLEANUP(fopen_seek);
ATF_TC_HEAD(fopen_seek, tc)
Modified: projects/routing/etc/Makefile
==============================================================================
--- projects/routing/etc/Makefile Tue Nov 17 03:34:20 2015 (r290972)
+++ projects/routing/etc/Makefile Tue Nov 17 05:41:47 2015 (r290973)
@@ -408,7 +408,7 @@ distrib-dirs: ${MTREES:N/*} distrib-clea
${METALOG.add} ; \
done; true
.endif
- ${INSTALL_SYMLINK} usr/src/sys ${DESTDIR}/sys
+ ${INSTALL_SYMLINK} ${SRCTOP:C/^\///}/sys ${DESTDIR}/sys
.if ${MK_MAN} != "no"
cd ${DESTDIR}${SHAREDIR}/man; \
for mandir in man*; do \
Modified: projects/routing/etc/mtree/BSD.usr.dist
==============================================================================
--- projects/routing/etc/mtree/BSD.usr.dist Tue Nov 17 03:34:20 2015 (r290972)
+++ projects/routing/etc/mtree/BSD.usr.dist Tue Nov 17 05:41:47 2015 (r290973)
@@ -543,12 +543,20 @@
..
bg_BG.UTF-8
..
+ ca_AD.ISO8859-1
+ ..
ca_AD.ISO8859-15
..
+ ca_ES.ISO8859-1
+ ..
ca_ES.ISO8859-15
..
+ ca_FR.ISO8859-1
+ ..
ca_FR.ISO8859-15
..
+ ca_IT.ISO8859-1
+ ..
ca_IT.ISO8859-15
..
ca_AD.UTF-8
@@ -563,18 +571,26 @@
..
cs_CZ.UTF-8
..
+ da_DK.ISO8859-1
+ ..
da_DK.ISO8859-15
..
da_DK.UTF-8
..
+ de_AT.ISO8859-1
+ ..
de_AT.ISO8859-15
..
de_AT.UTF-8
..
+ de_CH.ISO8859-1
+ ..
de_CH.ISO8859-15
..
de_CH.UTF-8
..
+ de_DE.ISO8859-1
+ ..
de_DE.ISO8859-15
..
de_DE.UTF-8
@@ -595,6 +611,8 @@
..
en_CA.UTF-8
..
+ en_GB.ISO8859-1
+ ..
en_GB.ISO8859-15
..
en_GB.US-ASCII
@@ -605,6 +623,8 @@
..
en_HK.UTF-8
..
+ en_IE.ISO8859-1
+ ..
en_IE.ISO8859-15
..
en_IE.UTF-8
@@ -639,6 +659,8 @@
..
es_CR.UTF-8
..
+ es_ES.ISO8859-1
+ ..
es_ES.ISO8859-15
..
es_ES.UTF-8
@@ -647,18 +669,26 @@
..
es_MX.UTF-8
..
+ et_EE.ISO8859-1
+ ..
et_EE.ISO8859-15
..
et_EE.UTF-8
..
+ eu_ES.ISO8859-1
+ ..
eu_ES.ISO8859-15
..
eu_ES.UTF-8
..
+ fi_FI.ISO8859-1
+ ..
fi_FI.ISO8859-15
..
fi_FI.UTF-8
..
+ fr_BE.ISO8859-1
+ ..
fr_BE.ISO8859-15
..
fr_BE.UTF-8
@@ -667,10 +697,14 @@
..
fr_CA.UTF-8
..
+ fr_CH.ISO8859-1
+ ..
fr_CH.ISO8859-15
..
fr_CH.UTF-8
..
+ fr_FR.ISO8859-1
+ ..
fr_FR.ISO8859-15
..
fr_FR.UTF-8
@@ -693,14 +727,20 @@
..
hy_AM.UTF-8
..
+ is_IS.ISO8859-1
+ ..
is_IS.ISO8859-15
..
is_IS.UTF-8
..
+ it_CH.ISO8859-1
+ ..
it_CH.ISO8859-15
..
it_CH.UTF-8
..
+ it_IT.ISO8859-1
+ ..
it_IT.ISO8859-15
..
it_IT.UTF-8
@@ -729,18 +769,26 @@
..
mn_Cyrl_MN.UTF-8
..
+ nb_NO.ISO8859-1
+ ..
nb_NO.ISO8859-15
..
nb_NO.UTF-8
..
+ nl_BE.ISO8859-1
+ ..
nl_BE.ISO8859-15
..
nl_BE.UTF-8
..
+ nl_NL.ISO8859-1
+ ..
nl_NL.ISO8859-15
..
nl_NL.UTF-8
..
+ nn_NO.ISO8859-1
+ ..
nn_NO.ISO8859-15
..
nn_NO.UTF-8
@@ -753,6 +801,8 @@
..
pt_BR.UTF-8
..
+ pt_PT.ISO8859-1
+ ..
pt_PT.ISO8859-15
..
pt_PT.UTF-8
@@ -791,10 +841,14 @@
..
sr_Latn_RS.UTF-8
..
+ sv_FI.ISO8859-1
+ ..
sv_FI.ISO8859-15
..
sv_FI.UTF-8
..
+ sv_SE.ISO8859-1
+ ..
sv_SE.ISO8859-15
..
sv_SE.UTF-8
@@ -811,6 +865,16 @@
..
uk_UA.UTF-8
..
+ zh_CN.GB18030
+ ..
+ zh_CN.GB2312
+ ..
+ zh_CN.GBK
+ ..
+ zh_CN.eucCN
+ ..
+ zh_CN.UTF-8
+ ..
zh_Hans_CN.GB18030
..
zh_Hans_CN.GB2312
@@ -829,6 +893,14 @@
..
zh_Hant_TW.UTF-8
..
+ zh_HK.Big5HKSCS
+ ..
+ zh_HK.UTF-8
+ ..
+ zh_TW.Big5
+ ..
+ zh_TW.UTF-8
+ ..
..
man
/set uname=man
@@ -1221,22 +1293,8 @@
..
ko_KR.eucKR
..
- la_LN.ISO8859-1
- ..
- la_LN.ISO8859-13
- ..
- la_LN.ISO8859-15
- ..
- la_LN.ISO8859-2
- ..
- la_LN.ISO8859-4
- ..
- la_LN.US-ASCII
- ..
lt_LT.ISO8859-13
..
- lt_LT.ISO8859-4
- ..
lt_LT.UTF-8
..
lv_LV.ISO8859-13
Modified: projects/routing/lib/libc/tests/Makefile.netbsd-tests
==============================================================================
--- projects/routing/lib/libc/tests/Makefile.netbsd-tests Tue Nov 17 03:34:20 2015 (r290972)
+++ projects/routing/lib/libc/tests/Makefile.netbsd-tests Tue Nov 17 05:41:47 2015 (r290973)
@@ -4,4 +4,6 @@ TESTSRC:= ${SRCTOP}/contrib/netbsd-tests
TESTSDIR:= ${TESTSBASE}/${RELDIR:C/libc\/tests/libc/}
+WARNS?= 2
+
.include <netbsd-tests.test.mk>
Modified: projects/routing/lib/libc/tests/gen/fnmatch_testcases.h
==============================================================================
--- projects/routing/lib/libc/tests/gen/fnmatch_testcases.h Tue Nov 17 03:34:20 2015 (r290972)
+++ projects/routing/lib/libc/tests/gen/fnmatch_testcases.h Tue Nov 17 05:41:47 2015 (r290973)
@@ -35,142 +35,142 @@ struct testcase {
int flags;
int result;
} testcases[] = {
- "", "", 0, 0,
- "a", "a", 0, 0,
- "a", "b", 0, FNM_NOMATCH,
- "a", "A", 0, FNM_NOMATCH,
- "*", "a", 0, 0,
- "*", "aa", 0, 0,
- "*a", "a", 0, 0,
- "*a", "b", 0, FNM_NOMATCH,
- "*a*", "b", 0, FNM_NOMATCH,
- "*a*b*", "ab", 0, 0,
- "*a*b*", "qaqbq", 0, 0,
- "*a*bb*", "qaqbqbbq", 0, 0,
- "*a*bc*", "qaqbqbcq", 0, 0,
- "*a*bb*", "qaqbqbb", 0, 0,
- "*a*bc*", "qaqbqbc", 0, 0,
- "*a*bb", "qaqbqbb", 0, 0,
- "*a*bc", "qaqbqbc", 0, 0,
- "*a*bb", "qaqbqbbq", 0, FNM_NOMATCH,
- "*a*bc", "qaqbqbcq", 0, FNM_NOMATCH,
- "*a*a*a*a*a*a*a*a*a*a*", "aaaaaaaaa", 0, FNM_NOMATCH,
- "*a*a*a*a*a*a*a*a*a*a*", "aaaaaaaaaa", 0, 0,
- "*a*a*a*a*a*a*a*a*a*a*", "aaaaaaaaaaa", 0, 0,
- ".*.*.*.*.*.*.*.*.*.*", ".........", 0, FNM_NOMATCH,
- ".*.*.*.*.*.*.*.*.*.*", "..........", 0, 0,
- ".*.*.*.*.*.*.*.*.*.*", "...........", 0, 0,
- "*?*?*?*?*?*?*?*?*?*?*", "123456789", 0, FNM_NOMATCH,
- "??????????*", "123456789", 0, FNM_NOMATCH,
- "*??????????", "123456789", 0, FNM_NOMATCH,
- "*?*?*?*?*?*?*?*?*?*?*", "1234567890", 0, 0,
- "??????????*", "1234567890", 0, 0,
- "*??????????", "1234567890", 0, 0,
- "*?*?*?*?*?*?*?*?*?*?*", "12345678901", 0, 0,
- "??????????*", "12345678901", 0, 0,
- "*??????????", "12345678901", 0, 0,
- "[x]", "x", 0, 0,
- "[*]", "*", 0, 0,
- "[?]", "?", 0, 0,
- "[", "[", 0, 0,
- "[[]", "[", 0, 0,
- "[[]", "x", 0, FNM_NOMATCH,
- "[*]", "", 0, FNM_NOMATCH,
- "[*]", "x", 0, FNM_NOMATCH,
- "[?]", "x", 0, FNM_NOMATCH,
- "*[*]*", "foo*foo", 0, 0,
- "*[*]*", "foo", 0, FNM_NOMATCH,
- "[0-9]", "0", 0, 0,
- "[0-9]", "5", 0, 0,
- "[0-9]", "9", 0, 0,
- "[0-9]", "/", 0, FNM_NOMATCH,
- "[0-9]", ":", 0, FNM_NOMATCH,
- "[0-9]", "*", 0, FNM_NOMATCH,
- "[!0-9]", "0", 0, FNM_NOMATCH,
- "[!0-9]", "5", 0, FNM_NOMATCH,
- "[!0-9]", "9", 0, FNM_NOMATCH,
- "[!0-9]", "/", 0, 0,
- "[!0-9]", ":", 0, 0,
- "[!0-9]", "*", 0, 0,
- "*[0-9]", "a0", 0, 0,
- "*[0-9]", "a5", 0, 0,
- "*[0-9]", "a9", 0, 0,
- "*[0-9]", "a/", 0, FNM_NOMATCH,
- "*[0-9]", "a:", 0, FNM_NOMATCH,
- "*[0-9]", "a*", 0, FNM_NOMATCH,
- "*[!0-9]", "a0", 0, FNM_NOMATCH,
- "*[!0-9]", "a5", 0, FNM_NOMATCH,
- "*[!0-9]", "a9", 0, FNM_NOMATCH,
- "*[!0-9]", "a/", 0, 0,
- "*[!0-9]", "a:", 0, 0,
- "*[!0-9]", "a*", 0, 0,
- "*[0-9]", "a00", 0, 0,
- "*[0-9]", "a55", 0, 0,
- "*[0-9]", "a99", 0, 0,
- "*[0-9]", "a0a0", 0, 0,
- "*[0-9]", "a5a5", 0, 0,
- "*[0-9]", "a9a9", 0, 0,
- "\\*", "*", 0, 0,
- "\\?", "?", 0, 0,
- "\\[x]", "[x]", 0, 0,
- "\\[", "[", 0, 0,
- "\\\\", "\\", 0, 0,
- "*\\**", "foo*foo", 0, 0,
- "*\\**", "foo", 0, FNM_NOMATCH,
- "*\\\\*", "foo\\foo", 0, 0,
- "*\\\\*", "foo", 0, FNM_NOMATCH,
- "\\(", "(", 0, 0,
- "\\a", "a", 0, 0,
- "\\*", "a", 0, FNM_NOMATCH,
- "\\?", "a", 0, FNM_NOMATCH,
- "\\*", "\\*", 0, FNM_NOMATCH,
- "\\?", "\\?", 0, FNM_NOMATCH,
- "\\[x]", "\\[x]", 0, FNM_NOMATCH,
- "\\[x]", "\\x", 0, FNM_NOMATCH,
- "\\[", "\\[", 0, FNM_NOMATCH,
- "\\(", "\\(", 0, FNM_NOMATCH,
- "\\a", "\\a", 0, FNM_NOMATCH,
- "\\", "\\", 0, FNM_NOMATCH,
- "\\", "", 0, 0,
- "\\*", "\\*", FNM_NOESCAPE, 0,
- "\\?", "\\?", FNM_NOESCAPE, 0,
- "\\", "\\", FNM_NOESCAPE, 0,
- "\\\\", "\\", FNM_NOESCAPE, FNM_NOMATCH,
- "\\\\", "\\\\", FNM_NOESCAPE, 0,
- "*\\*", "foo\\foo", FNM_NOESCAPE, 0,
- "*\\*", "foo", FNM_NOESCAPE, FNM_NOMATCH,
- "*", ".", FNM_PERIOD, FNM_NOMATCH,
- "?", ".", FNM_PERIOD, FNM_NOMATCH,
- ".*", ".", 0, 0,
- ".*", "..", 0, 0,
- ".*", ".a", 0, 0,
- "[0-9]", ".", FNM_PERIOD, FNM_NOMATCH,
- "a*", "a.", 0, 0,
- "a/a", "a/a", FNM_PATHNAME, 0,
- "a/*", "a/a", FNM_PATHNAME, 0,
- "*/a", "a/a", FNM_PATHNAME, 0,
- "*/*", "a/a", FNM_PATHNAME, 0,
- "a*b/*", "abbb/x", FNM_PATHNAME, 0,
- "a*b/*", "abbb/.x", FNM_PATHNAME, 0,
- "*", "a/a", FNM_PATHNAME, FNM_NOMATCH,
- "*/*", "a/a/a", FNM_PATHNAME, FNM_NOMATCH,
- "b/*", "b/.x", FNM_PATHNAME | FNM_PERIOD, FNM_NOMATCH,
- "b*/*", "a/.x", FNM_PATHNAME | FNM_PERIOD, FNM_NOMATCH,
- "b/.*", "b/.x", FNM_PATHNAME | FNM_PERIOD, 0,
- "b*/.*", "b/.x", FNM_PATHNAME | FNM_PERIOD, 0,
- "a", "A", FNM_CASEFOLD, 0,
- "A", "a", FNM_CASEFOLD, 0,
- "[a]", "A", FNM_CASEFOLD, 0,
- "[A]", "a", FNM_CASEFOLD, 0,
- "a", "b", FNM_CASEFOLD, FNM_NOMATCH,
- "a", "a/b", FNM_PATHNAME, FNM_NOMATCH,
- "*", "a/b", FNM_PATHNAME, FNM_NOMATCH,
- "*b", "a/b", FNM_PATHNAME, FNM_NOMATCH,
- "a", "a/b", FNM_PATHNAME | FNM_LEADING_DIR, 0,
- "*", "a/b", FNM_PATHNAME | FNM_LEADING_DIR, 0,
- "*", ".a/b", FNM_PATHNAME | FNM_LEADING_DIR, 0,
- "*a", ".a/b", FNM_PATHNAME | FNM_LEADING_DIR, 0,
- "*", ".a/b", FNM_PATHNAME | FNM_PERIOD | FNM_LEADING_DIR, FNM_NOMATCH,
- "*a", ".a/b", FNM_PATHNAME | FNM_PERIOD | FNM_LEADING_DIR, FNM_NOMATCH,
- "a*b/*", "abbb/.x", FNM_PATHNAME | FNM_PERIOD, FNM_NOMATCH,
+ { "", "", 0, 0 },
+ { "a", "a", 0, 0 },
+ { "a", "b", 0, FNM_NOMATCH },
+ { "a", "A", 0, FNM_NOMATCH },
+ { "*", "a", 0, 0 },
+ { "*", "aa", 0, 0 },
+ { "*a", "a", 0, 0 },
+ { "*a", "b", 0, FNM_NOMATCH },
+ { "*a*", "b", 0, FNM_NOMATCH },
+ { "*a*b*", "ab", 0, 0 },
+ { "*a*b*", "qaqbq", 0, 0 },
+ { "*a*bb*", "qaqbqbbq", 0, 0 },
+ { "*a*bc*", "qaqbqbcq", 0, 0 },
+ { "*a*bb*", "qaqbqbb", 0, 0 },
+ { "*a*bc*", "qaqbqbc", 0, 0 },
+ { "*a*bb", "qaqbqbb", 0, 0 },
+ { "*a*bc", "qaqbqbc", 0, 0 },
+ { "*a*bb", "qaqbqbbq", 0, FNM_NOMATCH },
+ { "*a*bc", "qaqbqbcq", 0, FNM_NOMATCH },
+ { "*a*a*a*a*a*a*a*a*a*a*", "aaaaaaaaa", 0, FNM_NOMATCH },
+ { "*a*a*a*a*a*a*a*a*a*a*", "aaaaaaaaaa", 0, 0 },
+ { "*a*a*a*a*a*a*a*a*a*a*", "aaaaaaaaaaa", 0, 0 },
+ { ".*.*.*.*.*.*.*.*.*.*", ".........", 0, FNM_NOMATCH },
+ { ".*.*.*.*.*.*.*.*.*.*", "..........", 0, 0 },
+ { ".*.*.*.*.*.*.*.*.*.*", "...........", 0, 0 },
+ { "*?*?*?*?*?*?*?*?*?*?*", "123456789", 0, FNM_NOMATCH },
+ { "??????????*", "123456789", 0, FNM_NOMATCH },
+ { "*??????????", "123456789", 0, FNM_NOMATCH },
+ { "*?*?*?*?*?*?*?*?*?*?*", "1234567890", 0, 0 },
+ { "??????????*", "1234567890", 0, 0 },
+ { "*??????????", "1234567890", 0, 0 },
+ { "*?*?*?*?*?*?*?*?*?*?*", "12345678901", 0, 0 },
+ { "??????????*", "12345678901", 0, 0 },
+ { "*??????????", "12345678901", 0, 0 },
+ { "[x]", "x", 0, 0 },
+ { "[*]", "*", 0, 0 },
+ { "[?]", "?", 0, 0 },
+ { "[", "[", 0, 0 },
+ { "[[]", "[", 0, 0 },
+ { "[[]", "x", 0, FNM_NOMATCH },
+ { "[*]", "", 0, FNM_NOMATCH },
+ { "[*]", "x", 0, FNM_NOMATCH },
+ { "[?]", "x", 0, FNM_NOMATCH },
+ { "*[*]*", "foo*foo", 0, 0 },
+ { "*[*]*", "foo", 0, FNM_NOMATCH },
+ { "[0-9]", "0", 0, 0 },
+ { "[0-9]", "5", 0, 0 },
+ { "[0-9]", "9", 0, 0 },
+ { "[0-9]", "/", 0, FNM_NOMATCH },
+ { "[0-9]", ":", 0, FNM_NOMATCH },
+ { "[0-9]", "*", 0, FNM_NOMATCH },
+ { "[!0-9]", "0", 0, FNM_NOMATCH },
+ { "[!0-9]", "5", 0, FNM_NOMATCH },
+ { "[!0-9]", "9", 0, FNM_NOMATCH },
+ { "[!0-9]", "/", 0, 0 },
+ { "[!0-9]", ":", 0, 0 },
+ { "[!0-9]", "*", 0, 0 },
+ { "*[0-9]", "a0", 0, 0 },
+ { "*[0-9]", "a5", 0, 0 },
+ { "*[0-9]", "a9", 0, 0 },
+ { "*[0-9]", "a/", 0, FNM_NOMATCH },
+ { "*[0-9]", "a:", 0, FNM_NOMATCH },
+ { "*[0-9]", "a*", 0, FNM_NOMATCH },
+ { "*[!0-9]", "a0", 0, FNM_NOMATCH },
+ { "*[!0-9]", "a5", 0, FNM_NOMATCH },
+ { "*[!0-9]", "a9", 0, FNM_NOMATCH },
+ { "*[!0-9]", "a/", 0, 0 },
+ { "*[!0-9]", "a:", 0, 0 },
+ { "*[!0-9]", "a*", 0, 0 },
+ { "*[0-9]", "a00", 0, 0 },
+ { "*[0-9]", "a55", 0, 0 },
+ { "*[0-9]", "a99", 0, 0 },
+ { "*[0-9]", "a0a0", 0, 0 },
+ { "*[0-9]", "a5a5", 0, 0 },
+ { "*[0-9]", "a9a9", 0, 0 },
+ { "\\*", "*", 0, 0 },
+ { "\\?", "?", 0, 0 },
+ { "\\[x]", "[x]", 0, 0 },
+ { "\\[", "[", 0, 0 },
+ { "\\\\", "\\", 0, 0 },
+ { "*\\**", "foo*foo", 0, 0 },
+ { "*\\**", "foo", 0, FNM_NOMATCH },
+ { "*\\\\*", "foo\\foo", 0, 0 },
+ { "*\\\\*", "foo", 0, FNM_NOMATCH },
+ { "\\(", "(", 0, 0 },
+ { "\\a", "a", 0, 0 },
+ { "\\*", "a", 0, FNM_NOMATCH },
+ { "\\?", "a", 0, FNM_NOMATCH },
+ { "\\*", "\\*", 0, FNM_NOMATCH },
+ { "\\?", "\\?", 0, FNM_NOMATCH },
+ { "\\[x]", "\\[x]", 0, FNM_NOMATCH },
+ { "\\[x]", "\\x", 0, FNM_NOMATCH },
+ { "\\[", "\\[", 0, FNM_NOMATCH },
+ { "\\(", "\\(", 0, FNM_NOMATCH },
+ { "\\a", "\\a", 0, FNM_NOMATCH },
+ { "\\", "\\", 0, FNM_NOMATCH },
+ { "\\", "", 0, 0 },
+ { "\\*", "\\*", FNM_NOESCAPE, 0 },
+ { "\\?", "\\?", FNM_NOESCAPE, 0 },
+ { "\\", "\\", FNM_NOESCAPE, 0 },
+ { "\\\\", "\\", FNM_NOESCAPE, FNM_NOMATCH },
+ { "\\\\", "\\\\", FNM_NOESCAPE, 0 },
+ { "*\\*", "foo\\foo", FNM_NOESCAPE, 0 },
+ { "*\\*", "foo", FNM_NOESCAPE, FNM_NOMATCH },
+ { "*", ".", FNM_PERIOD, FNM_NOMATCH },
+ { "?", ".", FNM_PERIOD, FNM_NOMATCH },
+ { ".*", ".", 0, 0 },
+ { ".*", "..", 0, 0 },
+ { ".*", ".a", 0, 0 },
+ { "[0-9]", ".", FNM_PERIOD, FNM_NOMATCH },
+ { "a*", "a.", 0, 0 },
+ { "a/a", "a/a", FNM_PATHNAME, 0 },
+ { "a/*", "a/a", FNM_PATHNAME, 0 },
+ { "*/a", "a/a", FNM_PATHNAME, 0 },
+ { "*/*", "a/a", FNM_PATHNAME, 0 },
+ { "a*b/*", "abbb/x", FNM_PATHNAME, 0 },
+ { "a*b/*", "abbb/.x", FNM_PATHNAME, 0 },
+ { "*", "a/a", FNM_PATHNAME, FNM_NOMATCH },
+ { "*/*", "a/a/a", FNM_PATHNAME, FNM_NOMATCH },
+ { "b/*", "b/.x", FNM_PATHNAME | FNM_PERIOD, FNM_NOMATCH },
+ { "b*/*", "a/.x", FNM_PATHNAME | FNM_PERIOD, FNM_NOMATCH },
+ { "b/.*", "b/.x", FNM_PATHNAME | FNM_PERIOD, 0 },
+ { "b*/.*", "b/.x", FNM_PATHNAME | FNM_PERIOD, 0 },
+ { "a", "A", FNM_CASEFOLD, 0 },
+ { "A", "a", FNM_CASEFOLD, 0 },
+ { "[a]", "A", FNM_CASEFOLD, 0 },
+ { "[A]", "a", FNM_CASEFOLD, 0 },
+ { "a", "b", FNM_CASEFOLD, FNM_NOMATCH },
+ { "a", "a/b", FNM_PATHNAME, FNM_NOMATCH },
+ { "*", "a/b", FNM_PATHNAME, FNM_NOMATCH },
+ { "*b", "a/b", FNM_PATHNAME, FNM_NOMATCH },
+ { "a", "a/b", FNM_PATHNAME | FNM_LEADING_DIR, 0 },
+ { "*", "a/b", FNM_PATHNAME | FNM_LEADING_DIR, 0 },
+ { "*", ".a/b", FNM_PATHNAME | FNM_LEADING_DIR, 0 },
+ { "*a", ".a/b", FNM_PATHNAME | FNM_LEADING_DIR, 0 },
+ { "*", ".a/b", FNM_PATHNAME | FNM_PERIOD | FNM_LEADING_DIR, FNM_NOMATCH },
+ { "*a", ".a/b", FNM_PATHNAME | FNM_PERIOD | FNM_LEADING_DIR, FNM_NOMATCH },
+ { "a*b/*", "abbb/.x", FNM_PATHNAME | FNM_PERIOD, FNM_NOMATCH },
};
Modified: projects/routing/lib/libc/tests/gen/ftw_test.c
==============================================================================
--- projects/routing/lib/libc/tests/gen/ftw_test.c Tue Nov 17 03:34:20 2015 (r290972)
+++ projects/routing/lib/libc/tests/gen/ftw_test.c Tue Nov 17 05:41:47 2015 (r290973)
@@ -49,7 +49,6 @@ extern char **environ;
static char template[] = "testftw.XXXXXXXXXX";
static char dir[PATH_MAX];
-static int failures;
static int ftwflags;
static int
Modified: projects/routing/lib/libc/tests/gen/popen_test.c
==============================================================================
--- projects/routing/lib/libc/tests/gen/popen_test.c Tue Nov 17 03:34:20 2015 (r290972)
+++ projects/routing/lib/libc/tests/gen/popen_test.c Tue Nov 17 05:41:47 2015 (r290973)
@@ -71,7 +71,7 @@ check_cloexec(FILE *fp, const char *mode
ATF_TC_WITHOUT_HEAD(popen_all_modes_test);
ATF_TC_BODY(popen_all_modes_test, tc)
{
- FILE *fp, *fp2;
+ FILE *fp;
int i, status;
const char *mode;
const char *allmodes[] = { "r", "w", "r+", "re", "we", "r+e", "re+" };
@@ -92,7 +92,7 @@ ATF_TC_BODY(popen_all_modes_test, tc)
ATF_TC_WITHOUT_HEAD(popen_rmodes_test);
ATF_TC_BODY(popen_rmodes_test, tc)
{
- FILE *fp, *fp2;
+ FILE *fp;
const char *rmodes[] = { "r", "r+", "re", "r+e", "re+" };
const char *mode;
char buf[80];
@@ -211,7 +211,7 @@ ATF_TC_WITHOUT_HEAD(popen_rwmodes_test);
ATF_TC_BODY(popen_rwmodes_test, tc)
{
const char *rwmodes[] = { "r+", "r+e", "re+" };
- FILE *fp, *fp2;
+ FILE *fp;
const char *mode;
char *sres;
char buf[80];
Modified: projects/routing/lib/libc/tests/locale/c16rtomb_test.c
==============================================================================
--- projects/routing/lib/libc/tests/locale/c16rtomb_test.c Tue Nov 17 03:34:20 2015 (r290972)
+++ projects/routing/lib/libc/tests/locale/c16rtomb_test.c Tue Nov 17 05:41:47 2015 (r290973)
@@ -42,13 +42,27 @@ __FBSDID("$FreeBSD$");
#include <atf-c.h>
-ATF_TC_WITHOUT_HEAD(c16rtomb_test);
-ATF_TC_BODY(c16rtomb_test, tc)
+static void
+require_lc_ctype(const char *locale_name)
{
- mbstate_t s;
- char buf[MB_LEN_MAX + 1];
+ char *lc_ctype_set;
- /* C/POSIX locale. */
+ lc_ctype_set = setlocale(LC_CTYPE, locale_name);
+ if (lc_ctype_set == NULL)
+ atf_tc_fail("setlocale(LC_CTYPE, \"%s\") failed; errno=%d",
+ locale_name, errno);
+
+ ATF_REQUIRE(strcmp(lc_ctype_set, locale_name) == 0);
+}
+
+static mbstate_t s;
+static char buf[MB_LEN_MAX + 1];
+
+ATF_TC_WITHOUT_HEAD(c16rtomb_c_locale_test);
+ATF_TC_BODY(c16rtomb_c_locale_test, tc)
+{
+
+ require_lc_ctype("C");
/*
* If the buffer argument is NULL, c16 is implicitly 0,
@@ -80,11 +94,13 @@ ATF_TC_BODY(c16rtomb_test, tc)
ATF_REQUIRE(c16rtomb(buf, 0xdca9, &s) == (size_t)-1);
ATF_REQUIRE(errno == EILSEQ);
ATF_REQUIRE((unsigned char)buf[0] == 0xcc);
+}
- /* ISO8859-1. */
+ATF_TC_WITHOUT_HEAD(c16rtomb_iso_8859_1_test);
+ATF_TC_BODY(c16rtomb_iso_8859_1_test, tc)
+{
- ATF_REQUIRE(strcmp(setlocale(LC_CTYPE, "en_US.ISO8859-1"),
- "en_US.ISO8859-1") == 0);
+ require_lc_ctype("en_US.ISO8859-1");
/* Unicode character 'Euro sign'. */
memset(&s, 0, sizeof(s));
@@ -92,21 +108,26 @@ ATF_TC_BODY(c16rtomb_test, tc)
ATF_REQUIRE(c16rtomb(buf, 0x20ac, &s) == (size_t)-1);
ATF_REQUIRE(errno == EILSEQ);
ATF_REQUIRE((unsigned char)buf[0] == 0xcc);
+}
- /* ISO8859-15. */
+ATF_TC_WITHOUT_HEAD(c16rtomb_iso_8859_15_test);
+ATF_TC_BODY(c16rtomb_iso_8859_15_test, tc)
+{
- ATF_REQUIRE(strcmp(setlocale(LC_CTYPE, "en_US.ISO8859-15"),
- "en_US.ISO8859-15") == 0);
+ require_lc_ctype("en_US.ISO8859-15");
/* Unicode character 'Euro sign'. */
memset(&s, 0, sizeof(s));
memset(buf, 0xcc, sizeof(buf));
ATF_REQUIRE(c16rtomb(buf, 0x20ac, &s) == 1);
ATF_REQUIRE((unsigned char)buf[0] == 0xa4 && (unsigned char)buf[1] == 0xcc);
+}
- /* UTF-8. */
+ATF_TC_WITHOUT_HEAD(c16rtomb_utf_8_test);
+ATF_TC_BODY(c16rtomb_utf_8_test, tc)
+{
- ATF_REQUIRE(strcmp(setlocale(LC_CTYPE, "en_US.UTF-8"), "en_US.UTF-8") == 0);
+ require_lc_ctype("en_US.UTF-8");
/* Unicode character 'Pile of poo'. */
memset(&s, 0, sizeof(s));
@@ -136,7 +157,10 @@ ATF_TC_BODY(c16rtomb_test, tc)
ATF_TP_ADD_TCS(tp)
{
- ATF_TP_ADD_TC(tp, c16rtomb_test);
+ ATF_TP_ADD_TC(tp, c16rtomb_c_locale_test);
+ ATF_TP_ADD_TC(tp, c16rtomb_iso_8859_1_test);
+ ATF_TP_ADD_TC(tp, c16rtomb_iso_8859_15_test);
+ ATF_TP_ADD_TC(tp, c16rtomb_utf_8_test);
return (atf_no_error());
}
Modified: projects/routing/lib/libc/tests/locale/iswctype_test.c
==============================================================================
--- projects/routing/lib/libc/tests/locale/iswctype_test.c Tue Nov 17 03:34:20 2015 (r290972)
+++ projects/routing/lib/libc/tests/locale/iswctype_test.c Tue Nov 17 05:41:47 2015 (r290973)
@@ -34,6 +34,8 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
+#include <sys/param.h>
+#include <errno.h>
#include <locale.h>
#include <stdio.h>
#include <string.h>
@@ -42,31 +44,45 @@ __FBSDID("$FreeBSD$");
#include <atf-c.h>
-ATF_TC_WITHOUT_HEAD(iswctype_test);
-ATF_TC_BODY(iswctype_test, tc)
+static void
+require_lc_ctype(const char *locale_name)
{
- wctype_t t;
- int i, j;
- struct {
- const char *name;
- int (*func)(wint_t);
- } cls[] = {
- { "alnum", iswalnum },
- { "alpha", iswalpha },
- { "blank", iswblank },
- { "cntrl", iswcntrl },
- { "digit", iswdigit },
- { "graph", iswgraph },
- { "lower", iswlower },
- { "print", iswprint },
- { "punct", iswpunct },
- { "space", iswspace },
- { "upper", iswupper },
- { "xdigit", iswxdigit }
- };
+ char *lc_ctype_set;
- /* C/POSIX locale. */
- for (i = 0; i < sizeof(cls) / sizeof(*cls); i++) {
+ lc_ctype_set = setlocale(LC_CTYPE, locale_name);
+ if (lc_ctype_set == NULL)
+ atf_tc_fail("setlocale(LC_CTYPE, \"%s\") failed; errno=%d",
+ locale_name, errno);
+
+ ATF_REQUIRE(strcmp(lc_ctype_set, locale_name) == 0);
+}
+
+static wctype_t t;
+static int i, j;
+static struct {
+ const char *name;
+ int (*func)(wint_t);
+} cls[] = {
+ { "alnum", iswalnum },
+ { "alpha", iswalpha },
+ { "blank", iswblank },
+ { "cntrl", iswcntrl },
+ { "digit", iswdigit },
+ { "graph", iswgraph },
+ { "lower", iswlower },
+ { "print", iswprint },
+ { "punct", iswpunct },
+ { "space", iswspace },
+ { "upper", iswupper },
+ { "xdigit", iswxdigit }
+};
+
+ATF_TC_WITHOUT_HEAD(iswctype_c_locale_test);
+ATF_TC_BODY(iswctype_c_locale_test, tc)
+{
+
+ require_lc_ctype("C");
+ for (i = 0; i < nitems(cls); i++) {
t = wctype(cls[i].name);
ATF_REQUIRE(t != 0);
for (j = 0; j < 256; j++)
@@ -76,10 +92,15 @@ ATF_TC_BODY(iswctype_test, tc)
ATF_REQUIRE(t == 0);
for (i = 0; i < 256; i++)
ATF_REQUIRE(iswctype(i, t) == 0);
+}
+
+ATF_TC_WITHOUT_HEAD(iswctype_euc_jp_test);
+ATF_TC_BODY(iswctype_euc_jp_test, tc)
+{
+
+ require_lc_ctype("ja_JP.eucJP");
- /* Japanese (EUC) locale. */
- ATF_REQUIRE(strcmp(setlocale(LC_CTYPE, "ja_JP.eucJP"), "ja_JP.eucJP") == 0);
- for (i = 0; i < sizeof(cls) / sizeof(*cls); i++) {
+ for (i = 0; i < nitems(cls); i++) {
t = wctype(cls[i].name);
ATF_REQUIRE(t != 0);
for (j = 0; j < 65536; j++)
@@ -94,7 +115,8 @@ ATF_TC_BODY(iswctype_test, tc)
ATF_TP_ADD_TCS(tp)
{
- ATF_TP_ADD_TC(tp, iswctype_test);
+ ATF_TP_ADD_TC(tp, iswctype_c_locale_test);
+ ATF_TP_ADD_TC(tp, iswctype_euc_jp_test);
return (atf_no_error());
}
Modified: projects/routing/lib/libc/tests/locale/mblen_test.c
==============================================================================
--- projects/routing/lib/libc/tests/locale/mblen_test.c Tue Nov 17 03:34:20 2015 (r290972)
+++ projects/routing/lib/libc/tests/locale/mblen_test.c Tue Nov 17 05:41:47 2015 (r290973)
@@ -46,7 +46,6 @@ __FBSDID("$FreeBSD$");
ATF_TC_WITHOUT_HEAD(mblen_test);
ATF_TC_BODY(mblen_test, tc)
{
- size_t len;
char buf[MB_LEN_MAX + 1];
/*
Modified: projects/routing/lib/libc/tests/locale/mbrlen_test.c
==============================================================================
--- projects/routing/lib/libc/tests/locale/mbrlen_test.c Tue Nov 17 03:34:20 2015 (r290972)
+++ projects/routing/lib/libc/tests/locale/mbrlen_test.c Tue Nov 17 05:41:47 2015 (r290973)
@@ -49,7 +49,6 @@ ATF_TC_WITHOUT_HEAD(mbrlen_test);
ATF_TC_BODY(mbrlen_test, tc)
{
mbstate_t s;
- size_t len;
char buf[MB_LEN_MAX + 1];
/* C/POSIX locale. */
Modified: projects/routing/lib/libc/tests/locale/mbrtoc16_test.c
==============================================================================
--- projects/routing/lib/libc/tests/locale/mbrtoc16_test.c Tue Nov 17 03:34:20 2015 (r290972)
+++ projects/routing/lib/libc/tests/locale/mbrtoc16_test.c Tue Nov 17 05:41:47 2015 (r290973)
@@ -42,16 +42,27 @@ __FBSDID("$FreeBSD$");
#include <atf-c.h>
-ATF_TC_WITHOUT_HEAD(mbrtoc16_test);
-ATF_TC_BODY(mbrtoc16_test, tc)
+static void
+require_lc_ctype(const char *locale_name)
{
- mbstate_t s;
- size_t len;
- char16_t c16;
-
- /*
- * C/POSIX locale.
- */
+ char *lc_ctype_set;
+
+ lc_ctype_set = setlocale(LC_CTYPE, locale_name);
+ if (lc_ctype_set == NULL)
+ atf_tc_fail("setlocale(LC_CTYPE, \"%s\") failed; errno=%d",
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-src-projects
mailing list