diff options
author | Arjun Shankar <arjun.is@lostca.se> | 2014-11-05 15:24:08 +0530 |
---|---|---|
committer | Siddhesh Poyarekar <siddhesh@redhat.com> | 2014-11-05 15:24:08 +0530 |
commit | 29955b5d9658b02d3a678d1f785db3d1e63184ca (patch) | |
tree | badd2ff184d36c461673ffbc9ec48914511f41f0 /wcsmbs | |
parent | ab97ee8f1bf70b24b417e8f690ce50563d508243 (diff) |
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 <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.
Diffstat (limited to 'wcsmbs')
-rw-r--r-- | wcsmbs/tst-btowc.c | 7 | ||||
-rw-r--r-- | wcsmbs/tst-mbrtowc.c | 7 | ||||
-rw-r--r-- | wcsmbs/tst-mbsrtowcs.c | 7 | ||||
-rw-r--r-- | wcsmbs/tst-wchar-h.c | 7 | ||||
-rw-r--r-- | wcsmbs/tst-wcpncpy.c | 7 | ||||
-rw-r--r-- | wcsmbs/tst-wcrtomb.c | 7 | ||||
-rw-r--r-- | wcsmbs/tst-wcsnlen.c | 7 | ||||
-rw-r--r-- | wcsmbs/tst-wcstof.c | 7 |
8 files changed, 40 insertions, 16 deletions
diff --git a/wcsmbs/tst-btowc.c b/wcsmbs/tst-btowc.c index d793622771..dc34f2b907 100644 --- a/wcsmbs/tst-btowc.c +++ b/wcsmbs/tst-btowc.c @@ -74,8 +74,8 @@ eof_test (void) /* Test the btowc() function for a few locales with known character sets. */ -int -main (void) +static int +do_test (void) { int result = 0; @@ -172,3 +172,6 @@ main (void) return result; } + +#define TEST_FUNCTION do_test () +#include "../test-skeleton.c" diff --git a/wcsmbs/tst-mbrtowc.c b/wcsmbs/tst-mbrtowc.c index 3e1eb728e8..a30b619395 100644 --- a/wcsmbs/tst-mbrtowc.c +++ b/wcsmbs/tst-mbrtowc.c @@ -151,8 +151,8 @@ utf8_test (void) } -int -main (void) +static int +do_test (void) { int result = 0; @@ -230,3 +230,6 @@ check_ascii (const char *locname) return res != 0; } + +#define TEST_FUNCTION do_test () +#include "../test-skeleton.c" diff --git a/wcsmbs/tst-mbsrtowcs.c b/wcsmbs/tst-mbsrtowcs.c index 8d7e2cbeef..405534d674 100644 --- a/wcsmbs/tst-mbsrtowcs.c +++ b/wcsmbs/tst-mbsrtowcs.c @@ -21,8 +21,8 @@ #include <string.h> #include <wchar.h> -int -main (void) +static int +do_test (void) { const unsigned char buf[] = { 'a', 'b', '\0', 'c', 'd', '\0', 'e' }; wchar_t out[sizeof (buf)]; @@ -62,3 +62,6 @@ main (void) } return result; } + +#define TEST_FUNCTION do_test () +#include "../test-skeleton.c" diff --git a/wcsmbs/tst-wchar-h.c b/wcsmbs/tst-wchar-h.c index 4cf2dd0690..fd2ad569a7 100644 --- a/wcsmbs/tst-wchar-h.c +++ b/wcsmbs/tst-wchar-h.c @@ -1,9 +1,12 @@ #include <stdlib.h> #include <wchar.h> -int -main (void) +static int +do_test (void) { mbstate_t x; return sizeof (x) - sizeof (mbstate_t); } + +#define TEST_FUNCTION do_test () +#include "../test-skeleton.c" diff --git a/wcsmbs/tst-wcpncpy.c b/wcsmbs/tst-wcpncpy.c index 74765e755e..4cf4aeccd0 100644 --- a/wcsmbs/tst-wcpncpy.c +++ b/wcsmbs/tst-wcpncpy.c @@ -20,8 +20,8 @@ #include <wchar.h> -int -main (void) +static int +do_test (void) { int result = 0; @@ -74,3 +74,6 @@ main (void) return result; } + +#define TEST_FUNCTION do_test () +#include "../test-skeleton.c" diff --git a/wcsmbs/tst-wcrtomb.c b/wcsmbs/tst-wcrtomb.c index 3f052f3b2d..cad343effd 100644 --- a/wcsmbs/tst-wcrtomb.c +++ b/wcsmbs/tst-wcrtomb.c @@ -26,8 +26,8 @@ static int check_ascii (const char *locname); -int -main (void) +static int +do_test (void) { int result = 0; @@ -92,3 +92,6 @@ check_ascii (const char *locname) return res != 0; } + +#define TEST_FUNCTION do_test () +#include "../test-skeleton.c" diff --git a/wcsmbs/tst-wcsnlen.c b/wcsmbs/tst-wcsnlen.c index 60e64ad657..8d4b8b5563 100644 --- a/wcsmbs/tst-wcsnlen.c +++ b/wcsmbs/tst-wcsnlen.c @@ -27,8 +27,8 @@ printf ("wcsnlen (L\"%s\", %d) = %d, not %d\n", Str, Max, n, Exp); \ } -int -main (void) +static int +do_test (void) { int result = 0; int n; @@ -48,3 +48,6 @@ main (void) return result; } + +#define TEST_FUNCTION do_test () +#include "../test-skeleton.c" diff --git a/wcsmbs/tst-wcstof.c b/wcsmbs/tst-wcstof.c index 197cb5c770..576a58c023 100644 --- a/wcsmbs/tst-wcstof.c +++ b/wcsmbs/tst-wcstof.c @@ -4,8 +4,8 @@ #include <string.h> #include <wctype.h> -int -main (void) +static int +do_test (void) { int result = 0; char buf[100]; @@ -21,3 +21,6 @@ main (void) return result; } + +#define TEST_FUNCTION do_test () +#include "../test-skeleton.c" |