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. --- malloc/tst-calloc.c | 7 +++++-- malloc/tst-malloc.c | 7 +++++-- malloc/tst-mallocstate.c | 7 +++++-- malloc/tst-mcheck.c | 7 +++++-- malloc/tst-mtrace.c | 7 +++++-- malloc/tst-obstack.c | 7 +++++-- 6 files changed, 30 insertions(+), 12 deletions(-) (limited to 'malloc') diff --git a/malloc/tst-calloc.c b/malloc/tst-calloc.c index 51e6c25ebf..7ad51246a3 100644 --- a/malloc/tst-calloc.c +++ b/malloc/tst-calloc.c @@ -104,8 +104,8 @@ null_test (void) } -int -main (void) +static int +do_test (void) { /* We are allocating blocks with `calloc' and check whether every block is completely cleared. We first try this for some fixed @@ -123,3 +123,6 @@ main (void) return 0; } + +#define TEST_FUNCTION do_test () +#include "../test-skeleton.c" diff --git a/malloc/tst-malloc.c b/malloc/tst-malloc.c index a75ab1e3aa..2685315077 100644 --- a/malloc/tst-malloc.c +++ b/malloc/tst-malloc.c @@ -29,8 +29,8 @@ merror (const char *msg) printf ("Error: %s\n", msg); } -int -main (void) +static int +do_test (void) { void *p, *q; int save; @@ -75,3 +75,6 @@ main (void) return errors != 0; } + +#define TEST_FUNCTION do_test () +#include "../test-skeleton.c" diff --git a/malloc/tst-mallocstate.c b/malloc/tst-mallocstate.c index 69c4500b85..539539ed03 100644 --- a/malloc/tst-mallocstate.c +++ b/malloc/tst-mallocstate.c @@ -29,8 +29,8 @@ merror (const char *msg) printf ("Error: %s\n", msg); } -int -main (void) +static int +do_test (void) { void *p1, *p2; void *save_state; @@ -79,3 +79,6 @@ main (void) * c-basic-offset: 2 * End: */ + +#define TEST_FUNCTION do_test () +#include "../test-skeleton.c" diff --git a/malloc/tst-mcheck.c b/malloc/tst-mcheck.c index 478ca8cd24..bd9ab0efa7 100644 --- a/malloc/tst-mcheck.c +++ b/malloc/tst-mcheck.c @@ -29,8 +29,8 @@ merror (const char *msg) printf ("Error: %s\n", msg); } -int -main (void) +static int +do_test (void) { void *p, *q; @@ -88,3 +88,6 @@ main (void) return errors != 0; } + +#define TEST_FUNCTION do_test () +#include "../test-skeleton.c" diff --git a/malloc/tst-mtrace.c b/malloc/tst-mtrace.c index 9b5151c7e0..b2c0c2c951 100644 --- a/malloc/tst-mtrace.c +++ b/malloc/tst-mtrace.c @@ -30,8 +30,8 @@ static void print (const void *node, VISIT value, int level); static FILE *fp; -int -main (void) +static int +do_test (void) { void *root = NULL; size_t linelen = 0; @@ -100,3 +100,6 @@ print (const void *node, VISIT value, int level) if (value == postorder || value == leaf) fprintf (fp, "%3d: %s", ++cnt, *(const char **) node); } + +#define TEST_FUNCTION do_test () +#include "../test-skeleton.c" diff --git a/malloc/tst-obstack.c b/malloc/tst-obstack.c index 769697f185..ee1385d0f7 100644 --- a/malloc/tst-obstack.c +++ b/malloc/tst-obstack.c @@ -25,8 +25,8 @@ verbose_free (void *buf) printf ("free (%p)\n", buf); } -int -main (void) +static int +do_test (void) { int result = 0; int align = 2; @@ -62,3 +62,6 @@ main (void) return result; } + +#define TEST_FUNCTION do_test () +#include "../test-skeleton.c" -- cgit 1.4.1