mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-22 13:00:06 +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.
252 lines
6.7 KiB
C
252 lines
6.7 KiB
C
/* Copyright (C) 2000-2014 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Contributed by Ulrich Drepper <drepper@gnu.org>, 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/>. */
|
|
|
|
#include <ctype.h>
|
|
#include <langinfo.h>
|
|
#include <locale.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <unistd.h>
|
|
#include <wchar.h>
|
|
#include <wctype.h>
|
|
#include <sys/types.h>
|
|
|
|
|
|
#define ZERO "\xe2\x82\x80"
|
|
#define ONE "\xe2\x82\x81"
|
|
#define TWO "\xe2\x82\x82"
|
|
#define THREE "\xe2\x82\x83"
|
|
#define FOUR "\xe2\x82\x84"
|
|
#define FIVE "\xe2\x82\x85"
|
|
#define SIX "\xe2\x82\x86"
|
|
#define SEVEN "\xe2\x82\x87"
|
|
#define EIGHT "\xe2\x82\x88"
|
|
#define NINE "\xe2\x82\x89"
|
|
|
|
static struct printf_int_test
|
|
{
|
|
int n;
|
|
const char *format;
|
|
const char *expected;
|
|
} printf_int_tests[] =
|
|
{
|
|
{ 0, "%I'10d", " " ZERO },
|
|
{ 1, "%I'10d", " " ONE },
|
|
{ 2, "%I'10d", " " TWO },
|
|
{ 3, "%I'10d", " " THREE },
|
|
{ 4, "%I'10d", " " FOUR },
|
|
{ 5, "%I'10d", " " FIVE },
|
|
{ 6, "%I'10d", " " SIX },
|
|
{ 7, "%I'10d", " " SEVEN },
|
|
{ 8, "%I'10d", " " EIGHT },
|
|
{ 9, "%I'10d", " " NINE },
|
|
{ 11, "%I'10d", " " ONE ONE },
|
|
{ 12, "%I'10d", " " ONE TWO },
|
|
{ 123, "%I10d", " " ONE TWO THREE },
|
|
{ 123, "%I'10d", " " ONE TWO THREE },
|
|
{ 1234, "%I10d", ONE TWO THREE FOUR },
|
|
{ 1234, "%I'10d", ONE "," TWO THREE FOUR },
|
|
{ 12345, "%I'10d", ONE TWO "," THREE FOUR FIVE },
|
|
{ 123456, "%I'10d", ONE TWO THREE "," FOUR FIVE SIX },
|
|
{ 1234567, "%I'10d", ONE "," TWO THREE FOUR "," FIVE SIX SEVEN }
|
|
};
|
|
#define nprintf_int_tests \
|
|
(sizeof (printf_int_tests) / sizeof (printf_int_tests[0]))
|
|
|
|
#define WZERO L"\x2080"
|
|
#define WONE L"\x2081"
|
|
#define WTWO L"\x2082"
|
|
#define WTHREE L"\x2083"
|
|
#define WFOUR L"\x2084"
|
|
#define WFIVE L"\x2085"
|
|
#define WSIX L"\x2086"
|
|
#define WSEVEN L"\x2087"
|
|
#define WEIGHT L"\x2088"
|
|
#define WNINE L"\x2089"
|
|
|
|
static struct wprintf_int_test
|
|
{
|
|
int n;
|
|
const wchar_t *format;
|
|
const wchar_t *expected;
|
|
} wprintf_int_tests[] =
|
|
{
|
|
{ 0, L"%I'10d", L" " WZERO },
|
|
{ 1, L"%I'10d", L" " WONE },
|
|
{ 2, L"%I'10d", L" " WTWO },
|
|
{ 3, L"%I'10d", L" " WTHREE },
|
|
{ 4, L"%I'10d", L" " WFOUR },
|
|
{ 5, L"%I'10d", L" " WFIVE },
|
|
{ 6, L"%I'10d", L" " WSIX },
|
|
{ 7, L"%I'10d", L" " WSEVEN },
|
|
{ 8, L"%I'10d", L" " WEIGHT },
|
|
{ 9, L"%I'10d", L" " WNINE },
|
|
{ 11, L"%I'10d", L" " WONE WONE },
|
|
{ 12, L"%I'10d", L" " WONE WTWO },
|
|
{ 123, L"%I10d", L" " WONE WTWO WTHREE },
|
|
{ 123, L"%I'10d", L" " WONE WTWO WTHREE },
|
|
{ 1234, L"%I10d", L" " WONE WTWO WTHREE WFOUR },
|
|
{ 1234, L"%I'10d", L" " WONE L"," WTWO WTHREE WFOUR },
|
|
{ 12345, L"%I'10d", L" " WONE WTWO L"," WTHREE WFOUR WFIVE },
|
|
{ 123456, L"%I'10d", L" " WONE WTWO WTHREE L"," WFOUR WFIVE WSIX },
|
|
{ 1234567, L"%I'10d", L" " WONE L"," WTWO WTHREE WFOUR L"," WFIVE WSIX WSEVEN }
|
|
};
|
|
#define nwprintf_int_tests \
|
|
(sizeof (wprintf_int_tests) / sizeof (wprintf_int_tests[0]))
|
|
|
|
|
|
static int
|
|
do_test (void)
|
|
{
|
|
int cnt;
|
|
int failures;
|
|
int status;
|
|
|
|
if (setlocale (LC_ALL, "test7") == NULL)
|
|
{
|
|
puts ("cannot set locale `test7'");
|
|
exit (1);
|
|
}
|
|
printf ("CODESET = \"%s\"\n", nl_langinfo (CODESET));
|
|
|
|
/* First: printf tests. */
|
|
failures = 0;
|
|
for (cnt = 0; cnt < (int) nprintf_int_tests; ++cnt)
|
|
{
|
|
char buf[100];
|
|
ssize_t n;
|
|
|
|
n = snprintf (buf, sizeof buf, printf_int_tests[cnt].format,
|
|
printf_int_tests[cnt].n);
|
|
|
|
printf ("%3d: got \"%s\", expected \"%s\"",
|
|
cnt, buf, printf_int_tests[cnt].expected);
|
|
|
|
if (n != (ssize_t) strlen (printf_int_tests[cnt].expected)
|
|
|| strcmp (buf, printf_int_tests[cnt].expected) != 0)
|
|
{
|
|
puts (" -> FAILED");
|
|
++failures;
|
|
}
|
|
else
|
|
puts (" -> OK");
|
|
}
|
|
|
|
printf ("%d failures in printf tests\n", failures);
|
|
status = failures != 0;
|
|
|
|
/* wprintf tests. */
|
|
failures = 0;
|
|
for (cnt = 0; cnt < (int) nwprintf_int_tests; ++cnt)
|
|
{
|
|
wchar_t buf[100];
|
|
ssize_t n;
|
|
|
|
n = swprintf (buf, sizeof buf / sizeof (buf[0]),
|
|
wprintf_int_tests[cnt].format,
|
|
wprintf_int_tests[cnt].n);
|
|
|
|
printf ("%3d: got \"%ls\", expected \"%ls\"",
|
|
cnt, buf, wprintf_int_tests[cnt].expected);
|
|
|
|
if (n != (ssize_t) wcslen (wprintf_int_tests[cnt].expected)
|
|
|| wcscmp (buf, wprintf_int_tests[cnt].expected) != 0)
|
|
{
|
|
puts (" -> FAILED");
|
|
++failures;
|
|
}
|
|
else
|
|
puts (" -> OK");
|
|
}
|
|
|
|
printf ("%d failures in wprintf tests\n", failures);
|
|
status = failures != 0;
|
|
|
|
/* ctype tests. This makes sure that the multibyte character digit
|
|
representations are not handle in this table. */
|
|
failures = 0;
|
|
for (cnt = 0; cnt < 256; ++cnt)
|
|
if (cnt >= '0' && cnt <= '9')
|
|
{
|
|
if (! isdigit (cnt))
|
|
{
|
|
printf ("isdigit ('%c') == 0\n", cnt);
|
|
++failures;
|
|
}
|
|
}
|
|
else
|
|
{
|
|
if (isdigit (cnt))
|
|
{
|
|
printf ("isdigit (%d) != 0\n", cnt);
|
|
++failures;
|
|
}
|
|
}
|
|
|
|
printf ("%d failures in ctype tests\n", failures);
|
|
status = failures != 0;
|
|
|
|
/* wctype tests. This makes sure the second set of digits is also
|
|
recorded. */
|
|
failures = 0;
|
|
for (cnt = 0; cnt < 256; ++cnt)
|
|
if (cnt >= '0' && cnt <= '9')
|
|
{
|
|
if (! iswdigit (cnt))
|
|
{
|
|
printf ("iswdigit (L'%c') == 0\n", cnt);
|
|
++failures;
|
|
}
|
|
}
|
|
else
|
|
{
|
|
if (iswdigit (cnt))
|
|
{
|
|
printf ("iswdigit (%d) != 0\n", cnt);
|
|
++failures;
|
|
}
|
|
}
|
|
|
|
for (cnt = 0x2070; cnt < 0x2090; ++cnt)
|
|
if (cnt >= 0x2080 && cnt <= 0x2089)
|
|
{
|
|
if (! iswdigit (cnt))
|
|
{
|
|
printf ("iswdigit (U%04X) == 0\n", cnt);
|
|
++failures;
|
|
}
|
|
}
|
|
else
|
|
{
|
|
if (iswdigit (cnt))
|
|
{
|
|
printf ("iswdigit (U%04X) != 0\n", cnt);
|
|
++failures;
|
|
}
|
|
}
|
|
|
|
printf ("%d failures in wctype tests\n", failures);
|
|
status = failures != 0;
|
|
|
|
return status;
|
|
}
|
|
|
|
#define TEST_FUNCTION do_test ()
|
|
#include "../test-skeleton.c"
|