mirror of
				https://sourceware.org/git/glibc.git
				synced 2025-10-30 10:45:40 +03:00 
			
		
		
		
	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.
		
			
				
	
	
		
			130 lines
		
	
	
		
			2.7 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			130 lines
		
	
	
		
			2.7 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| #include <locale.h>
 | |
| #include <stdio.h>
 | |
| #include <stdlib.h>
 | |
| #include <string.h>
 | |
| #include <time.h>
 | |
| #include <wchar.h>
 | |
| 
 | |
| 
 | |
| static int
 | |
| do_test (void)
 | |
| {
 | |
|   locale_t l;
 | |
|   locale_t old;
 | |
|   struct tm tm;
 | |
|   char buf[1000];
 | |
|   wchar_t wbuf[1000];
 | |
|   int result = 0;
 | |
|   size_t n;
 | |
| 
 | |
|   l = newlocale (LC_ALL_MASK, "de_DE.ISO-8859-1", NULL);
 | |
|   if (l == NULL)
 | |
|     {
 | |
|       puts ("newlocale failed");
 | |
|       exit (1);
 | |
|     }
 | |
| 
 | |
|   memset (&tm, '\0', sizeof (tm));
 | |
| 
 | |
|   tm.tm_year = 102;
 | |
|   tm.tm_mon = 2;
 | |
|   tm.tm_mday = 1;
 | |
| 
 | |
|   if (strftime (buf, sizeof (buf), "%e %^B %Y", &tm) == 0)
 | |
|     {
 | |
|       puts ("initial strftime failed");
 | |
|       exit (1);
 | |
|     }
 | |
|   if (strcmp (buf, " 1 MARCH 2002") != 0)
 | |
|     {
 | |
|       printf ("initial strftime: expected \"%s\", got \"%s\"\n",
 | |
| 	      " 1 MARCH 2002", buf);
 | |
|       result = 1;
 | |
|     }
 | |
|   else
 | |
|     printf ("got \"%s\"\n", buf);
 | |
| 
 | |
|   /* Now using the extended locale model.  */
 | |
|   if (strftime_l (buf, sizeof (buf), "%e %^B %Y", &tm, l) == 0)
 | |
|     {
 | |
|       puts ("strftime_l failed");
 | |
|       result = 1;
 | |
|     }
 | |
|   else if (strcmp (buf, " 1 M\xc4RZ 2002") != 0)
 | |
|     {
 | |
|       printf ("strftime_l: expected \"%s\", got \"%s\"\n",
 | |
| 	      " 1 M\xc4RZ 2002", buf);
 | |
|       result = 1;
 | |
|     }
 | |
|   else
 | |
|     {
 | |
|       setlocale (LC_ALL, "de_DE.ISO-8859-1");
 | |
|       printf ("got \"%s\"\n", buf);
 | |
|       setlocale (LC_ALL, "C");
 | |
|     }
 | |
| 
 | |
|   /* And the wide character version.  */
 | |
|   if (wcsftime_l (wbuf, sizeof (wbuf) / sizeof (wbuf[0]), L"%e %^B %Y", &tm, l)
 | |
|       == 0)
 | |
|     {
 | |
|       puts ("wcsftime_l failed");
 | |
|       result = 1;
 | |
|     }
 | |
|   else if (wcscmp (wbuf, L" 1 M\x00c4RZ 2002") != 0)
 | |
|     {
 | |
|       printf ("wcsftime_l: expected \"%ls\", got \"%ls\"\n",
 | |
| 	      L" 1 M\x00c4RZ 2002", wbuf);
 | |
|       result = 1;
 | |
|     }
 | |
|   else
 | |
|     {
 | |
|       setlocale (LC_ALL, "de_DE.ISO-8859-1");
 | |
|       printf ("got \"%ls\"\n", wbuf);
 | |
|       setlocale (LC_ALL, "C");
 | |
|     }
 | |
| 
 | |
|   old = uselocale (l);
 | |
| 
 | |
|   n = strftime (buf, sizeof (buf), "%e %^B %Y", &tm);
 | |
| 
 | |
|   /* Switch back.  */
 | |
|   (void) uselocale (old);
 | |
| 
 | |
|   if (n == 0)
 | |
|     {
 | |
|       puts ("strftime after first uselocale failed");
 | |
|       result = 1;
 | |
|     }
 | |
|   else if (strcmp (buf, " 1 M\xc4RZ 2002") != 0)
 | |
|     {
 | |
|       printf ("strftime in non-C locale: expected \"%s\", got \"%s\"\n",
 | |
| 	      " 1 M\xc4RZ 2002", buf);
 | |
|       result = 1;
 | |
|     }
 | |
|   else
 | |
|     {
 | |
|       setlocale (LC_ALL, "de_DE.ISO-8859-1");
 | |
|       printf ("got \"%s\"\n", buf);
 | |
|       setlocale (LC_ALL, "C");
 | |
|     }
 | |
| 
 | |
|   if (strftime (buf, sizeof (buf), "%e %^B %Y", &tm) == 0)
 | |
|     {
 | |
|       puts ("strftime after second uselocale failed");
 | |
|       result = 1;
 | |
|     }
 | |
|   else if (strcmp (buf, " 1 MARCH 2002") != 0)
 | |
|     {
 | |
|       printf ("initial strftime: expected \"%s\", got \"%s\"\n",
 | |
| 	      " 1 MARCH 2002", buf);
 | |
|       result = 1;
 | |
|     }
 | |
|   else
 | |
|     printf ("got \"%s\"\n", buf);
 | |
| 
 | |
|   return result;
 | |
| }
 | |
| 
 | |
| #define TEST_FUNCTION do_test ()
 | |
| #include "../test-skeleton.c"
 |