mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-22 04:50:07 +00:00
29955b5d96
This patch modifies several test cases to use test-skeleton.c. It was generated by a bash script written for this purpose and thus excludes several other tests which I deemed worth a visual inspection before making the change. I intend to follow up with individual patches to the tests skipped by the script. The script itself resides at http://git.io/WODAmg and should reproduce this very patch when run against master. ChangeLog: 2014-10-30 Arjun Shankar <arjun.is@lostca.se> * catgets/test-gencat.c: Use test-skeleton.c. * catgets/tst-catgets.c: Likewise. * csu/tst-empty.c: Likewise. * elf/tst-audit2.c: Likewise. * elf/tst-global1.c: Likewise. * elf/tst-pathopt.c: Likewise. * elf/tst-piemod1.c: Likewise. * elf/tst-tls10.c: Likewise. * elf/tst-tls11.c: Likewise. * elf/tst-tls12.c: Likewise. * gnulib/tst-gcc.c: Likewise. * iconvdata/tst-e2big.c: Likewise. * iconvdata/tst-loading.c: Likewise. * iconv/tst-iconv1.c: Likewise. * iconv/tst-iconv2.c: Likewise. * inet/test-inet6_opt.c: Likewise. * inet/tst-gethnm.c: Likewise. * inet/tst-network.c: Likewise. * inet/tst-ntoa.c: Likewise. * intl/tst-codeset.c: Likewise. * intl/tst-gettext2.c: Likewise. * intl/tst-gettext3.c: Likewise. * intl/tst-ngettext.c: Likewise. * intl/tst-translit.c: Likewise. * io/test-stat.c: Likewise. * libio/test-fmemopen.c: Likewise. * libio/tst-freopen.c: Likewise. * libio/tst-sscanf.c: Likewise. * libio/tst-ungetwc1.c: Likewise. * libio/tst-ungetwc2.c: Likewise. * libio/tst-widetext.c: Likewise. * localedata/tst-ctype.c: Likewise. * localedata/tst-digits.c: Likewise. * localedata/tst-leaks.c: Likewise. * localedata/tst-mbswcs1.c: Likewise. * localedata/tst-mbswcs2.c: Likewise. * localedata/tst-mbswcs3.c: Likewise. * localedata/tst-mbswcs4.c: Likewise. * localedata/tst-mbswcs5.c: Likewise. * localedata/tst-setlocale.c: Likewise. * localedata/tst-trans.c: Likewise. * localedata/tst-wctype.c: Likewise. * localedata/tst-xlocale1.c: Likewise. * login/tst-grantpt.c: Likewise. * malloc/tst-calloc.c: Likewise. * malloc/tst-malloc.c: Likewise. * malloc/tst-mallocstate.c: Likewise. * malloc/tst-mcheck.c: Likewise. * malloc/tst-mtrace.c: Likewise. * malloc/tst-obstack.c: Likewise. * math/atest-exp2.c: Likewise. * math/atest-exp.c: Likewise. * math/atest-sincos.c: Likewise. * math/test-matherr.c: Likewise. * math/test-misc.c: Likewise. * math/test-powl.c: Likewise. * math/tst-definitions.c: Likewise. * misc/tst-dirname.c: Likewise. * misc/tst-efgcvt.c: Likewise. * misc/tst-fdset.c: Likewise. * misc/tst-hsearch.c: Likewise. * misc/tst-mntent2.c: Likewise. * nptl/tst-sem7.c: Likewise. * nptl/tst-sem8.c: Likewise. * nptl/tst-sem9.c: Likewise. * nss/test-netdb.c: Likewise. * posix/tst-fnmatch.c: Likewise. * posix/tst-getlogin.c: Likewise. * posix/tst-gnuglob.c: Likewise. * posix/tst-mmap.c: Likewise. * pwd/tst-getpw.c: Likewise. * resolv/tst-inet_ntop.c: Likewise. * rt/tst-timer.c: Likewise. * stdio-common/test-fseek.c: Likewise. * stdio-common/test-popen.c: Likewise. * stdio-common/test-vfprintf.c: Likewise. * stdio-common/tst-cookie.c: Likewise. * stdio-common/tst-fileno.c: Likewise. * stdio-common/tst-gets.c: Likewise. * stdio-common/tst-obprintf.c: Likewise. * stdio-common/tst-perror.c: Likewise. * stdio-common/tst-sprintf2.c: Likewise. * stdio-common/tst-sprintf3.c: Likewise. * stdio-common/tst-sprintf.c: Likewise. * stdio-common/tst-swprintf.c: Likewise. * stdio-common/tst-tmpnam.c: Likewise. * stdio-common/tst-unbputc.c: Likewise. * stdio-common/tst-wc-printf.c: Likewise. * stdlib/tst-environ.c: Likewise. * stdlib/tst-fmtmsg.c: Likewise. * stdlib/tst-limits.c: Likewise. * stdlib/tst-rand48-2.c: Likewise. * stdlib/tst-rand48.c: Likewise. * stdlib/tst-random2.c: Likewise. * stdlib/tst-random.c: Likewise. * stdlib/tst-strtol.c: Likewise. * stdlib/tst-strtoll.c: Likewise. * stdlib/tst-tls-atexit.c: Likewise. * stdlib/tst-xpg-basename.c: Likewise. * string/test-ffs.c: Likewise. * string/tst-bswap.c: Likewise. * string/tst-inlcall.c: Likewise. * string/tst-strtok.c: Likewise. * string/tst-strxfrm.c: Likewise. * sysdeps/x86_64/tst-audit10.c: Likewise. * sysdeps/x86_64/tst-audit3.c: Likewise. * sysdeps/x86_64/tst-audit4.c: Likewise. * sysdeps/x86_64/tst-audit5.c: Likewise. * time/tst-ftime_l.c: Likewise. * time/tst-getdate.c: Likewise. * time/tst-mktime3.c: Likewise. * time/tst-mktime.c: Likewise. * time/tst-posixtz.c: Likewise. * time/tst-strptime2.c: Likewise. * time/tst-strptime3.c: Likewise. * wcsmbs/tst-btowc.c: Likewise. * wcsmbs/tst-mbrtowc.c: Likewise. * wcsmbs/tst-mbsrtowcs.c: Likewise. * wcsmbs/tst-wchar-h.c: Likewise. * wcsmbs/tst-wcpncpy.c: Likewise. * wcsmbs/tst-wcrtomb.c: Likewise. * wcsmbs/tst-wcsnlen.c: Likewise. * wcsmbs/tst-wcstof.c: Likewise.
236 lines
6.9 KiB
C
236 lines
6.9 KiB
C
/* Copyright (C) 2000-2014 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Contributed by Ulrich Drepper <drepper@redhat.com>, 2000.
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Lesser General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2.1 of the License, or (at your option) any later version.
|
|
|
|
The GNU C Library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
License along with the GNU C Library; if not, see
|
|
<http://www.gnu.org/licenses/>. */
|
|
|
|
/* We always want assert to be fully defined. */
|
|
#undef NDEBUG
|
|
#include <assert.h>
|
|
#include <locale.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <wchar.h>
|
|
|
|
|
|
static int check_ascii (const char *locname);
|
|
|
|
/* UTF-8 single byte feeding test for mbrtowc(),
|
|
contributed by Markus Kuhn <mkuhn@acm.org>. */
|
|
static int
|
|
utf8_test_1 (void)
|
|
{
|
|
wchar_t wc;
|
|
mbstate_t s;
|
|
|
|
wc = 42; /* arbitrary number */
|
|
memset (&s, 0, sizeof (s)); /* get s into initial state */
|
|
assert (mbrtowc (&wc, "\xE2", 1, &s) == (size_t) -2); /* 1st byte processed */
|
|
assert (mbrtowc (&wc, "\x89", 1, &s) == (size_t) -2); /* 2nd byte processed */
|
|
assert (wc == 42); /* no value has not been stored into &wc yet */
|
|
assert (mbrtowc (&wc, "\xA0", 1, &s) == 1); /* 3nd byte processed */
|
|
assert (wc == 0x2260); /* E2 89 A0 = U+2260 (not equal) decoded correctly */
|
|
assert (mbrtowc (&wc, "", 1, &s) == 0); /* test final byte processing */
|
|
assert (wc == 0); /* test final byte decoding */
|
|
|
|
/* The following test is by Al Viro <aviro@redhat.com>. */
|
|
const char str[] = "\xe0\xa0\x80";
|
|
|
|
wc = 42; /* arbitrary number */
|
|
memset (&s, 0, sizeof (s)); /* get s into initial state */
|
|
assert (mbrtowc (&wc, str, 1, &s) == -2);
|
|
assert (mbrtowc (&wc, str + 1, 2, &s) == 2);
|
|
assert (wc == 0x800);
|
|
|
|
wc = 42; /* arbitrary number */
|
|
memset (&s, 0, sizeof (s)); /* get s into initial state */
|
|
assert (mbrtowc (&wc, str, 3, &s) == 3);
|
|
assert (wc == 0x800);
|
|
|
|
return 0;
|
|
}
|
|
|
|
/* Test for NUL byte processing via empty string. */
|
|
static int
|
|
utf8_test_2 (void)
|
|
{
|
|
wchar_t wc;
|
|
mbstate_t s;
|
|
|
|
wc = 42; /* arbitrary number */
|
|
memset (&s, 0, sizeof (s)); /* get s into initial state */
|
|
assert (mbrtowc (NULL, "", 1, &s) == 0); /* valid terminator */
|
|
assert (mbsinit (&s));
|
|
|
|
wc = 42; /* arbitrary number */
|
|
memset (&s, 0, sizeof (s)); /* get s into initial state */
|
|
assert (mbrtowc (&wc, "\xE2", 1, &s) == (size_t) -2); /* 1st byte processed */
|
|
assert (mbrtowc (NULL, "", 1, &s) == (size_t) -1); /* invalid terminator */
|
|
|
|
wc = 42; /* arbitrary number */
|
|
memset (&s, 0, sizeof (s)); /* get s into initial state */
|
|
assert (mbrtowc (&wc, "\xE2", 1, &s) == (size_t) -2); /* 1st byte processed */
|
|
assert (mbrtowc (&wc, "\x89", 1, &s) == (size_t) -2); /* 2nd byte processed */
|
|
assert (mbrtowc (NULL, "", 1, &s) == (size_t) -1); /* invalid terminator */
|
|
|
|
wc = 42; /* arbitrary number */
|
|
memset (&s, 0, sizeof (s)); /* get s into initial state */
|
|
assert (mbrtowc (&wc, "\xE2", 1, &s) == (size_t) -2); /* 1st byte processed */
|
|
assert (mbrtowc (&wc, "\x89", 1, &s) == (size_t) -2); /* 2nd byte processed */
|
|
assert (mbrtowc (&wc, "\xA0", 1, &s) == 1); /* 3nd byte processed */
|
|
assert (mbrtowc (NULL, "", 1, &s) == 0); /* valid terminator */
|
|
assert (mbsinit (&s));
|
|
|
|
return 0;
|
|
}
|
|
|
|
/* Test for NUL byte processing via NULL string. */
|
|
static int
|
|
utf8_test_3 (void)
|
|
{
|
|
wchar_t wc;
|
|
mbstate_t s;
|
|
|
|
wc = 42; /* arbitrary number */
|
|
memset (&s, 0, sizeof (s)); /* get s into initial state */
|
|
assert (mbrtowc (NULL, NULL, 0, &s) == 0); /* valid terminator */
|
|
assert (mbsinit (&s));
|
|
|
|
wc = 42; /* arbitrary number */
|
|
memset (&s, 0, sizeof (s)); /* get s into initial state */
|
|
assert (mbrtowc (&wc, "\xE2", 1, &s) == (size_t) -2); /* 1st byte processed */
|
|
assert (mbrtowc (NULL, NULL, 0, &s) == (size_t) -1); /* invalid terminator */
|
|
|
|
wc = 42; /* arbitrary number */
|
|
memset (&s, 0, sizeof (s)); /* get s into initial state */
|
|
assert (mbrtowc (&wc, "\xE2", 1, &s) == (size_t) -2); /* 1st byte processed */
|
|
assert (mbrtowc (&wc, "\x89", 1, &s) == (size_t) -2); /* 2nd byte processed */
|
|
assert (mbrtowc (NULL, NULL, 0, &s) == (size_t) -1); /* invalid terminator */
|
|
|
|
wc = 42; /* arbitrary number */
|
|
memset (&s, 0, sizeof (s)); /* get s into initial state */
|
|
assert (mbrtowc (&wc, "\xE2", 1, &s) == (size_t) -2); /* 1st byte processed */
|
|
assert (mbrtowc (&wc, "\x89", 1, &s) == (size_t) -2); /* 2nd byte processed */
|
|
assert (mbrtowc (&wc, "\xA0", 1, &s) == 1); /* 3nd byte processed */
|
|
assert (mbrtowc (NULL, NULL, 0, &s) == 0); /* valid terminator */
|
|
assert (mbsinit (&s));
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int
|
|
utf8_test (void)
|
|
{
|
|
const char *locale = "de_DE.UTF-8";
|
|
int error = 0;
|
|
|
|
if (!setlocale (LC_CTYPE, locale))
|
|
{
|
|
fprintf (stderr, "locale '%s' not available!\n", locale);
|
|
exit (1);
|
|
}
|
|
|
|
error |= utf8_test_1 ();
|
|
error |= utf8_test_2 ();
|
|
error |= utf8_test_3 ();
|
|
|
|
return error;
|
|
}
|
|
|
|
|
|
static int
|
|
do_test (void)
|
|
{
|
|
int result = 0;
|
|
|
|
/* Check mapping of ASCII range for some character sets which have
|
|
ASCII as a subset. For those the wide char generated must have
|
|
the same value. */
|
|
setlocale (LC_ALL, "C");
|
|
result |= check_ascii (setlocale (LC_ALL, NULL));
|
|
|
|
setlocale (LC_ALL, "de_DE.UTF-8");
|
|
result |= check_ascii (setlocale (LC_ALL, NULL));
|
|
result |= utf8_test ();
|
|
|
|
setlocale (LC_ALL, "ja_JP.EUC-JP");
|
|
result |= check_ascii (setlocale (LC_ALL, NULL));
|
|
|
|
return result;
|
|
}
|
|
|
|
|
|
static int
|
|
check_ascii (const char *locname)
|
|
{
|
|
int c;
|
|
int res = 0;
|
|
|
|
printf ("Testing locale \"%s\":\n", locname);
|
|
|
|
for (c = 0; c <= 127; ++c)
|
|
{
|
|
char buf[MB_CUR_MAX];
|
|
wchar_t wc = 0xffffffff;
|
|
mbstate_t s;
|
|
size_t n, i;
|
|
|
|
for (i = 0; i < MB_CUR_MAX; ++i)
|
|
buf[i] = c + i;
|
|
|
|
memset (&s, '\0', sizeof (s));
|
|
|
|
n = mbrtowc (&wc, buf, MB_CUR_MAX, &s);
|
|
if (n == (size_t) -1)
|
|
{
|
|
printf ("%s: '\\x%x': encoding error\n", locname, c);
|
|
++res;
|
|
}
|
|
else if (n == (size_t) -2)
|
|
{
|
|
printf ("%s: '\\x%x': incomplete character\n", locname, c);
|
|
++res;
|
|
}
|
|
else if (n == 0 && c != 0)
|
|
{
|
|
printf ("%s: '\\x%x': 0 returned\n", locname, c);
|
|
++res;
|
|
}
|
|
else if (n != 0 && c == 0)
|
|
{
|
|
printf ("%s: '\\x%x': not 0 returned\n", locname, c);
|
|
++res;
|
|
}
|
|
else if (c != 0 && n != 1)
|
|
{
|
|
printf ("%s: '\\x%x': not 1 returned\n", locname, c);
|
|
++res;
|
|
}
|
|
else if (wc != (wchar_t) c)
|
|
{
|
|
printf ("%s: '\\x%x': wc != L'\\x%x'\n", locname, c, c);
|
|
++res;
|
|
}
|
|
}
|
|
|
|
printf (res == 1 ? "%d error\n" : "%d errors\n", res);
|
|
|
|
return res != 0;
|
|
}
|
|
|
|
#define TEST_FUNCTION do_test ()
|
|
#include "../test-skeleton.c"
|