From 29955b5d9658b02d3a678d1f785db3d1e63184ca Mon Sep 17 00:00:00 2001 From: Arjun Shankar Date: Wed, 5 Nov 2014 15:24:08 +0530 Subject: Modify several tests to use test-skeleton.c 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 * 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. --- localedata/tst-ctype.c | 7 +++++-- localedata/tst-digits.c | 7 +++++-- localedata/tst-leaks.c | 7 +++++-- localedata/tst-mbswcs1.c | 7 +++++-- localedata/tst-mbswcs2.c | 7 +++++-- localedata/tst-mbswcs3.c | 7 +++++-- localedata/tst-mbswcs4.c | 7 +++++-- localedata/tst-mbswcs5.c | 7 +++++-- localedata/tst-setlocale.c | 7 +++++-- localedata/tst-trans.c | 7 +++++-- localedata/tst-wctype.c | 7 +++++-- localedata/tst-xlocale1.c | 7 +++++-- 12 files changed, 60 insertions(+), 24 deletions(-) (limited to 'localedata') diff --git a/localedata/tst-ctype.c b/localedata/tst-ctype.c index ceda891145..a4e8fcf4dc 100644 --- a/localedata/tst-ctype.c +++ b/localedata/tst-ctype.c @@ -61,8 +61,8 @@ static struct classes } -int -main (void) +static int +do_test (void) { const char *cp; const char *cp2; @@ -447,3 +447,6 @@ punct = %04x alnum = %04x\n", printf (" No errors for `%s' locale\n\n\n", setlocale (LC_ALL, NULL)); return 0; } + +#define TEST_FUNCTION do_test () +#include "../test-skeleton.c" diff --git a/localedata/tst-digits.c b/localedata/tst-digits.c index 9b3ebcdaa1..76356e9d5c 100644 --- a/localedata/tst-digits.c +++ b/localedata/tst-digits.c @@ -111,8 +111,8 @@ static struct wprintf_int_test (sizeof (wprintf_int_tests) / sizeof (wprintf_int_tests[0])) -int -main (void) +static int +do_test (void) { int cnt; int failures; @@ -246,3 +246,6 @@ main (void) return status; } + +#define TEST_FUNCTION do_test () +#include "../test-skeleton.c" diff --git a/localedata/tst-leaks.c b/localedata/tst-leaks.c index 7a4b557f59..ccd44f2c62 100644 --- a/localedata/tst-leaks.c +++ b/localedata/tst-leaks.c @@ -1,8 +1,8 @@ #include #include -int -main (void) +static int +do_test (void) { int cnt; @@ -16,3 +16,6 @@ main (void) return 0; } + +#define TEST_FUNCTION do_test () +#include "../test-skeleton.c" diff --git a/localedata/tst-mbswcs1.c b/localedata/tst-mbswcs1.c index 14f1372253..140482900f 100644 --- a/localedata/tst-mbswcs1.c +++ b/localedata/tst-mbswcs1.c @@ -33,8 +33,8 @@ } \ putc ('\n', stdout) -int -main (void) +static int +do_test (void) { const unsigned char buf[6] = { 0x25, 0xe2, 0x82, 0xac, 0xce, 0xbb }; mbstate_t state; @@ -60,3 +60,6 @@ main (void) return result; } + +#define TEST_FUNCTION do_test () +#include "../test-skeleton.c" diff --git a/localedata/tst-mbswcs2.c b/localedata/tst-mbswcs2.c index 25fa9516a0..9cd95d6808 100644 --- a/localedata/tst-mbswcs2.c +++ b/localedata/tst-mbswcs2.c @@ -35,8 +35,8 @@ } \ putc ('\n', stdout) -int -main (void) +static int +do_test (void) { unsigned char buf[6] = { 0x25, 0xe2, 0x82, 0xac, 0xce, 0xbb }; mbstate_t state; @@ -62,3 +62,6 @@ main (void) return result; } + +#define TEST_FUNCTION do_test () +#include "../test-skeleton.c" diff --git a/localedata/tst-mbswcs3.c b/localedata/tst-mbswcs3.c index 8db65c54d3..a068541a7c 100644 --- a/localedata/tst-mbswcs3.c +++ b/localedata/tst-mbswcs3.c @@ -38,8 +38,8 @@ putc ('\n', stdout); \ } -int -main (void) +static int +do_test (void) { unsigned char buf[6] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }; const unsigned char bufcheck[6] = { 0x25, 0xe2, 0x82, 0xac, 0xce, 0xbb }; @@ -73,3 +73,6 @@ main (void) return result; } + +#define TEST_FUNCTION do_test () +#include "../test-skeleton.c" diff --git a/localedata/tst-mbswcs4.c b/localedata/tst-mbswcs4.c index 09b74179fb..a4fe60dff8 100644 --- a/localedata/tst-mbswcs4.c +++ b/localedata/tst-mbswcs4.c @@ -34,8 +34,8 @@ } \ putc ('\n', stdout) -int -main (void) +static int +do_test (void) { unsigned char buf[6] = { 0x25, 0xe2, 0x82, 0xac, 0xce, 0xbb }; mbstate_t state; @@ -60,3 +60,6 @@ main (void) return result; } + +#define TEST_FUNCTION do_test () +#include "../test-skeleton.c" diff --git a/localedata/tst-mbswcs5.c b/localedata/tst-mbswcs5.c index e18862c1d0..c44f12a49d 100644 --- a/localedata/tst-mbswcs5.c +++ b/localedata/tst-mbswcs5.c @@ -37,8 +37,8 @@ putc ('\n', stdout); \ } -int -main (void) +static int +do_test (void) { unsigned char buf[7] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }; const unsigned char bufcheck[7] = { 0x25, 0xe2, 0x82, 0xac, 0xce, 0xbb, 0 }; @@ -72,3 +72,6 @@ main (void) return result; } + +#define TEST_FUNCTION do_test () +#include "../test-skeleton.c" diff --git a/localedata/tst-setlocale.c b/localedata/tst-setlocale.c index 1f8e68d887..a09a4de531 100644 --- a/localedata/tst-setlocale.c +++ b/localedata/tst-setlocale.c @@ -3,8 +3,8 @@ #include #include -int -main (void) +static int +do_test (void) { char q[30]; char *s; @@ -23,3 +23,6 @@ main (void) return strcmp (s, "de_DE.UTF-8") != 0; } + +#define TEST_FUNCTION do_test () +#include "../test-skeleton.c" diff --git a/localedata/tst-trans.c b/localedata/tst-trans.c index 5e09631384..0b0be83c78 100644 --- a/localedata/tst-trans.c +++ b/localedata/tst-trans.c @@ -24,8 +24,8 @@ #include #include -int -main (void) +static int +do_test (void) { char buf[30]; wchar_t wbuf[30]; @@ -68,3 +68,6 @@ main (void) return errors; } + +#define TEST_FUNCTION do_test () +#include "../test-skeleton.c" diff --git a/localedata/tst-wctype.c b/localedata/tst-wctype.c index bd2b057b54..eb720309e5 100644 --- a/localedata/tst-wctype.c +++ b/localedata/tst-wctype.c @@ -24,8 +24,8 @@ #include #include -int -main (void) +static int +do_test (void) { wctype_t wct; wchar_t buf[1000]; @@ -141,3 +141,6 @@ main (void) return result; } + +#define TEST_FUNCTION do_test () +#include "../test-skeleton.c" diff --git a/localedata/tst-xlocale1.c b/localedata/tst-xlocale1.c index 297c9ad7e1..9f545a02c3 100644 --- a/localedata/tst-xlocale1.c +++ b/localedata/tst-xlocale1.c @@ -20,8 +20,8 @@ static struct #define ntests (sizeof (tests) / sizeof (tests[0])) -int -main (void) +static int +do_test (void) { size_t cnt; int result = 0; @@ -73,3 +73,6 @@ main (void) return result; } + +#define TEST_FUNCTION do_test () +#include "../test-skeleton.c" -- cgit 1.4.1