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. --- stdlib/tst-environ.c | 7 +++++-- stdlib/tst-fmtmsg.c | 7 +++++-- stdlib/tst-limits.c | 7 +++++-- stdlib/tst-rand48-2.c | 7 +++++-- stdlib/tst-rand48.c | 7 +++++-- stdlib/tst-random.c | 7 +++++-- stdlib/tst-random2.c | 7 +++++-- stdlib/tst-strtol.c | 7 +++++-- stdlib/tst-strtoll.c | 7 +++++-- stdlib/tst-tls-atexit.c | 7 +++++-- stdlib/tst-xpg-basename.c | 7 +++++-- 11 files changed, 55 insertions(+), 22 deletions(-) (limited to 'stdlib') diff --git a/stdlib/tst-environ.c b/stdlib/tst-environ.c index 3316d7e555..b1de2f99d7 100644 --- a/stdlib/tst-environ.c +++ b/stdlib/tst-environ.c @@ -25,8 +25,8 @@ char putenv_val[100] = VAR "=some longer value"; -int -main (void) +static int +do_test (void) { int result = 0; const char *valp; @@ -219,3 +219,6 @@ main (void) return result; } + +#define TEST_FUNCTION do_test () +#include "../test-skeleton.c" diff --git a/stdlib/tst-fmtmsg.c b/stdlib/tst-fmtmsg.c index c3748d64d5..b7948c5f1e 100644 --- a/stdlib/tst-fmtmsg.c +++ b/stdlib/tst-fmtmsg.c @@ -7,8 +7,8 @@ #define MM_TEST 10 -int -main (void) +static int +do_test (void) { int result = 0; @@ -80,3 +80,6 @@ main (void) return result; } + +#define TEST_FUNCTION do_test () +#include "../test-skeleton.c" diff --git a/stdlib/tst-limits.c b/stdlib/tst-limits.c index 265b9dbfbb..6e51dcadb5 100644 --- a/stdlib/tst-limits.c +++ b/stdlib/tst-limits.c @@ -16,8 +16,8 @@ bitval (int bits) } -int -main (void) +static int +do_test (void) { int result = 0; @@ -67,3 +67,6 @@ main (void) return result; } + +#define TEST_FUNCTION do_test () +#include "../test-skeleton.c" diff --git a/stdlib/tst-rand48-2.c b/stdlib/tst-rand48-2.c index 3079b98839..8b8fef4430 100644 --- a/stdlib/tst-rand48-2.c +++ b/stdlib/tst-rand48-2.c @@ -3,8 +3,8 @@ #include #include -int -main (void) +static int +do_test (void) { time_t t = time (NULL); int i, ret = 0; @@ -111,3 +111,6 @@ main (void) return ret; } + +#define TEST_FUNCTION do_test () +#include "../test-skeleton.c" diff --git a/stdlib/tst-rand48.c b/stdlib/tst-rand48.c index 52e1b96afe..973c62e1eb 100644 --- a/stdlib/tst-rand48.c +++ b/stdlib/tst-rand48.c @@ -8,8 +8,8 @@ #endif -int -main (void) +static int +do_test (void) { unsigned short int xs[3] = { 0x0001, 0x0012, 0x0123 }; unsigned short int lxs[7]; @@ -388,3 +388,6 @@ drand48() and erand48 in lines %d and %d produce different results\n", return result; } + +#define TEST_FUNCTION do_test () +#include "../test-skeleton.c" diff --git a/stdlib/tst-random.c b/stdlib/tst-random.c index 47195d635a..8fe0993dd7 100644 --- a/stdlib/tst-random.c +++ b/stdlib/tst-random.c @@ -46,8 +46,8 @@ const unsigned int seed[3] = { 0x12344321U, 0xEE11DD22U, 0xFEDCBA98 }; void fail (const char *msg, int s, int i) __attribute__ ((__noreturn__)); -int -main (void) +static int +do_test (void) { long int rnd[nseq][nrnd]; /* pseudorandom numbers */ char* state[nseq]; /* state for PRNG */ @@ -117,3 +117,6 @@ fail (const char *msg, int s, int i) printf ("%s (seq %d, pos %d).\n", msg, s, i); exit (1); } + +#define TEST_FUNCTION do_test () +#include "../test-skeleton.c" diff --git a/stdlib/tst-random2.c b/stdlib/tst-random2.c index 0553b62992..da840f30be 100644 --- a/stdlib/tst-random2.c +++ b/stdlib/tst-random2.c @@ -20,8 +20,8 @@ #include #include -int -main (void) +static int +do_test (void) { int pass; int ret = 0; @@ -56,3 +56,6 @@ main (void) } return ret; } + +#define TEST_FUNCTION do_test () +#include "../test-skeleton.c" diff --git a/stdlib/tst-strtol.c b/stdlib/tst-strtol.c index eebd8f7afa..448102a2d9 100644 --- a/stdlib/tst-strtol.c +++ b/stdlib/tst-strtol.c @@ -534,8 +534,8 @@ static const struct ltest tests[] = /* Prototypes for local functions. */ static void expand (char *dst, int c); -int -main (void) +static int +do_test (void) { const struct ltest *lt; char *ep; @@ -623,3 +623,6 @@ expand (dst, c) else (void) sprintf (dst, "%#.3o", (unsigned int) c); } + +#define TEST_FUNCTION do_test () +#include "../test-skeleton.c" diff --git a/stdlib/tst-strtoll.c b/stdlib/tst-strtoll.c index 0c77254d52..93f1a56a56 100644 --- a/stdlib/tst-strtoll.c +++ b/stdlib/tst-strtoll.c @@ -309,8 +309,8 @@ static const struct ltest tests[] = /* Prototypes for local functions. */ static void expand (char *dst, int c); -int -main (void) +static int +do_test (void) { const struct ltest *lt; char *ep; @@ -398,3 +398,6 @@ expand (dst, c) else (void) sprintf (dst, "%#.3o", (unsigned int) c); } + +#define TEST_FUNCTION do_test () +#include "../test-skeleton.c" diff --git a/stdlib/tst-tls-atexit.c b/stdlib/tst-tls-atexit.c index 1ba3fae352..c03a3e5ed3 100644 --- a/stdlib/tst-tls-atexit.c +++ b/stdlib/tst-tls-atexit.c @@ -60,8 +60,8 @@ load (void *u) return NULL; } -int -main (void) +static int +do_test (void) { pthread_t t; int ret; @@ -109,3 +109,6 @@ main (void) return 0; } + +#define TEST_FUNCTION do_test () +#include "../test-skeleton.c" diff --git a/stdlib/tst-xpg-basename.c b/stdlib/tst-xpg-basename.c index 61e2e4b14c..facc78313c 100644 --- a/stdlib/tst-xpg-basename.c +++ b/stdlib/tst-xpg-basename.c @@ -37,8 +37,8 @@ static struct }; -int -main (void) +static int +do_test (void) { size_t i = 0; int errors = 0; @@ -64,3 +64,6 @@ main (void) return errors; } + +#define TEST_FUNCTION do_test () +#include "../test-skeleton.c" -- cgit v1.2.3