mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-01 09:20:19 +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.
122 lines
3.0 KiB
C
122 lines
3.0 KiB
C
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <time.h>
|
|
|
|
struct
|
|
{
|
|
time_t when;
|
|
const char *tz;
|
|
const char *result;
|
|
} tests[] =
|
|
{
|
|
{ 909312849L, "AEST-10AEDST-11,M10.5.0,M3.5.0",
|
|
"1998/10/25 21:54:09 dst=1 zone=AEDST" },
|
|
{ 924864849L, "AEST-10AEDST-11,M10.5.0,M3.5.0",
|
|
"1999/04/23 20:54:09 dst=0 zone=AEST" },
|
|
{ 919973892L, "AEST-10AEDST-11,M10.5.0,M3.5.0",
|
|
"1999/02/26 07:18:12 dst=1 zone=AEDST" },
|
|
{ 909312849L, "EST+5EDT,M4.1.0/2,M10.5.0/2",
|
|
"1998/10/25 05:54:09 dst=0 zone=EST" },
|
|
{ 909312849L, "EST5EDT,M4.1.0/2,M10.5.0/2",
|
|
"1998/10/25 05:54:09 dst=0 zone=EST" },
|
|
{ 909312849L, "<EST5>5EDT,M4.1.0/2,M10.5.0/2",
|
|
"1998/10/25 05:54:09 dst=0 zone=EST5" },
|
|
{ 924864849L, "EST+5EDT,M4.1.0/2,M10.5.0/2",
|
|
"1999/04/23 06:54:09 dst=1 zone=EDT" },
|
|
{ 919973892L, "EST+5EDT,M4.1.0/2,M10.5.0/2",
|
|
"1999/02/25 15:18:12 dst=0 zone=EST" },
|
|
};
|
|
|
|
static int
|
|
do_test (void)
|
|
{
|
|
int result = 0;
|
|
size_t cnt;
|
|
|
|
for (cnt = 0; cnt < sizeof (tests) / sizeof (tests[0]); ++cnt)
|
|
{
|
|
char buf[100];
|
|
struct tm *tmp;
|
|
|
|
printf ("TZ = \"%s\", time = %ld => ", tests[cnt].tz, tests[cnt].when);
|
|
fflush (stdout);
|
|
|
|
setenv ("TZ", tests[cnt].tz, 1);
|
|
|
|
tmp = localtime (&tests[cnt].when);
|
|
|
|
snprintf (buf, sizeof (buf),
|
|
"%04d/%02d/%02d %02d:%02d:%02d dst=%d zone=%s",
|
|
tmp->tm_year + 1900, tmp->tm_mon + 1, tmp->tm_mday,
|
|
tmp->tm_hour, tmp->tm_min, tmp->tm_sec, tmp->tm_isdst,
|
|
tzname[tmp->tm_isdst ? 1 : 0]);
|
|
|
|
fputs (buf, stdout);
|
|
|
|
if (strcmp (buf, tests[cnt].result) == 0)
|
|
puts (", OK");
|
|
else
|
|
{
|
|
result = 1;
|
|
puts (", FAIL");
|
|
}
|
|
}
|
|
|
|
setenv ("TZ", "Universal", 1);
|
|
localtime (&tests[0].when);
|
|
printf ("TZ = \"Universal\" daylight %d tzname = { \"%s\", \"%s\" }",
|
|
daylight, tzname[0], tzname[1]);
|
|
if (! daylight)
|
|
puts (", OK");
|
|
else
|
|
{
|
|
result = 1;
|
|
puts (", FAIL");
|
|
}
|
|
|
|
setenv ("TZ", "AEST-10AEDST-11,M10.5.0,M3.5.0", 1);
|
|
tzset ();
|
|
printf ("TZ = \"AEST-10AEDST-11,M10.5.0,M3.5.0\" daylight %d"
|
|
" tzname = { \"%s\", \"%s\" }", daylight, tzname[0], tzname[1]);
|
|
if (daylight
|
|
&& strcmp (tzname[0], "AEST") == 0 && strcmp (tzname[1], "AEDST") == 0)
|
|
puts (", OK");
|
|
else
|
|
{
|
|
result = 1;
|
|
puts (", FAIL");
|
|
}
|
|
|
|
setenv ("TZ", "<AB1>-10<AB2>-11,M10.5.0,M3.5.0", 1);
|
|
tzset ();
|
|
printf ("TZ = \"<AB1>-10<AB2>-11,M10.5.0,M3.5.0\" daylight %d"
|
|
" tzname = { \"%s\", \"%s\" }", daylight, tzname[0], tzname[1]);
|
|
if (daylight
|
|
&& strcmp (tzname[0], "AB1") == 0 && strcmp (tzname[1], "AB2") == 0)
|
|
puts (", OK");
|
|
else
|
|
{
|
|
result = 1;
|
|
puts (", FAIL");
|
|
}
|
|
|
|
setenv ("TZ", "<BB1>-10", 1);
|
|
tzset ();
|
|
printf ("TZ = \"<BB1>-10\" daylight %d"
|
|
" tzname = { \"%s\", \"%s\" }", daylight, tzname[0], tzname[1]);
|
|
if (daylight == 0
|
|
&& strcmp (tzname[0], "BB1") == 0 && strcmp (tzname[1], "BB1") == 0)
|
|
puts (", OK");
|
|
else
|
|
{
|
|
result = 1;
|
|
puts (", FAIL");
|
|
}
|
|
|
|
return result;
|
|
}
|
|
|
|
#define TEST_FUNCTION do_test ()
|
|
#include "../test-skeleton.c"
|