commit 29955b5d9658b02d3a678d1f785db3d1e63184ca

Author: Arjun Shankar <arjun.is@lostca.se>

Date:   Wed Nov 5 15:24:08 2014 +0530

    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.

    	* 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-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.

    	* elf/tst-audit3.c: Likewise.

    	* elf/tst-audit4.c: Likewise.

    	* elf/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.

diff --git a/catgets/test-gencat.c b/catgets/test-gencat.c

index eaa9b89..282974c 100644

--- a/catgets/test-gencat.c

+++ b/catgets/test-gencat.c

@@ -3,8 +3,8 @@

 #include <stdio.h>

 #include <stdlib.h>

-int

-main (void)

+static int

+do_test (void)

 {

   nl_catd catalog;

   setlocale (LC_ALL, "");

@@ -29,3 +29,6 @@ main (void)

   return 0;

 }

+

+#define TEST_FUNCTION do_test ()

+#include "../test-skeleton.c"

diff --git a/catgets/tst-catgets.c b/catgets/tst-catgets.c

index fdaa834..a0a4089 100644

--- a/catgets/tst-catgets.c

+++ b/catgets/tst-catgets.c

@@ -14,8 +14,8 @@ static const char *msgs[] =

 #define ROUNDS 5

-int

-main (void)

+static int

+do_test (void)

 {

   int rnd;

   int result = 0;

@@ -64,3 +64,6 @@ main (void)

   return result;

 }

+

+#define TEST_FUNCTION do_test ()

+#include "../test-skeleton.c"

diff --git a/csu/tst-empty.c b/csu/tst-empty.c

index 980dcd6..e99468e 100644

--- a/csu/tst-empty.c

+++ b/csu/tst-empty.c

@@ -1,6 +1,9 @@

 /* The most useful C program known to man.  */

-int

-main (void)

+static int

+do_test (void)

 {

   return 0;

 }

+

+#define TEST_FUNCTION do_test ()

+#include "../test-skeleton.c"

diff --git a/elf/tst-audit2.c b/elf/tst-audit2.c

index b4fa906..acad1b0 100644

--- a/elf/tst-audit2.c

+++ b/elf/tst-audit2.c

@@ -31,8 +31,8 @@ calloc (size_t n, size_t m)

   return ptr;

 }

-int

-main (void)

+static int

+do_test (void)

 {

   if (magic[1] != MAGIC1 || magic[0] != MAGIC2)

     {

@@ -42,3 +42,6 @@ main (void)

   return 0;

 }

+

+#define TEST_FUNCTION do_test ()

+#include "../test-skeleton.c"

diff --git a/elf/tst-global1.c b/elf/tst-global1.c

index 1611b51..4df335c 100644

--- a/elf/tst-global1.c

+++ b/elf/tst-global1.c

@@ -1,8 +1,8 @@

 #include <dlfcn.h>

 #include <stdio.h>

-int

-main (void)

+static int

+do_test (void)

 {

   void *h1 = dlopen ("$ORIGIN/testobj6.so", RTLD_GLOBAL|RTLD_LAZY);

   if (h1 == NULL)

@@ -34,3 +34,6 @@ main (void)

   return 0;

 }

+

+#define TEST_FUNCTION do_test ()

+#include "../test-skeleton.c"

diff --git a/elf/tst-pathopt.c b/elf/tst-pathopt.c

index 1f7aac2..8d73ad4 100644

--- a/elf/tst-pathopt.c

+++ b/elf/tst-pathopt.c

@@ -4,8 +4,8 @@

 #include <stdlib.h>

-int

-main (void)

+static int

+do_test (void)

 {

   void *h;

   int (*fp) (int);

@@ -37,3 +37,6 @@ main (void)

   return result;

 }

+

+#define TEST_FUNCTION do_test ()

+#include "../test-skeleton.c"

diff --git a/elf/tst-piemod1.c b/elf/tst-piemod1.c

index ad439da..6e98b5f 100644

--- a/elf/tst-piemod1.c

+++ b/elf/tst-piemod1.c

@@ -6,8 +6,8 @@ foo (void)

   return 21;

 }

-int

-main (void)

+static int

+do_test (void)

 {

   int val = foo ();

   if (val != 34)

@@ -18,3 +18,6 @@ main (void)

   return 0;

 }

+

+#define TEST_FUNCTION do_test ()

+#include "../test-skeleton.c"

diff --git a/elf/tst-tls10.c b/elf/tst-tls10.c

index 347243f..eb1ecb9 100644

--- a/elf/tst-tls10.c

+++ b/elf/tst-tls10.c

@@ -8,8 +8,8 @@ __thread struct A local = { 1, 2, 3 };

   if (p->a != S || p->b != S + 1 || p->c != S + 2)	\

     abort ()

-int

-main (void)

+static int

+do_test (void)

 {

   struct A *p;

   if (local.a != 1 || local.b != 2 || local.c != 3)

@@ -35,3 +35,6 @@ main (void)

   exit (0);

 }

+

+#define TEST_FUNCTION do_test ()

+#include "../test-skeleton.c"

diff --git a/elf/tst-tls11.c b/elf/tst-tls11.c

index 8a2fef4..8ceac14 100644

--- a/elf/tst-tls11.c

+++ b/elf/tst-tls11.c

@@ -5,8 +5,8 @@

   if (p->a != S || p->b != S + 1 || p->c != S + 2)	\

     abort ()

-int

-main (void)

+static int

+do_test (void)

 {

   struct A *p;

   check1 ();

@@ -24,3 +24,6 @@ main (void)

   exit (0);

 }

+

+#define TEST_FUNCTION do_test ()

+#include "../test-skeleton.c"

diff --git a/elf/tst-tls12.c b/elf/tst-tls12.c

index 9086d17..8093894 100644

--- a/elf/tst-tls12.c

+++ b/elf/tst-tls12.c

@@ -5,8 +5,8 @@

   if (p->a != S || p->b != S + 1 || p->c != S + 2)	\

     abort ()

-int

-main (void)

+static int

+do_test (void)

 {

   struct A *p;

   check1 ();

@@ -15,3 +15,6 @@ main (void)

   exit (0);

 }

+

+#define TEST_FUNCTION do_test ()

+#include "../test-skeleton.c"

diff --git a/gnulib/tst-gcc.c b/gnulib/tst-gcc.c

index 71fab28..9f4ba83 100644

--- a/gnulib/tst-gcc.c

+++ b/gnulib/tst-gcc.c

@@ -51,8 +51,8 @@

   })

-int

-main (void)

+static int

+do_test (void)

 {

   int result = 0;

   int __integer_type;

@@ -71,3 +71,6 @@ main (void)

   return result;

 }

+

+#define TEST_FUNCTION do_test ()

+#include "../test-skeleton.c"

diff --git a/iconv/tst-iconv1.c b/iconv/tst-iconv1.c

index d806ce6..0609f50 100644

--- a/iconv/tst-iconv1.c

+++ b/iconv/tst-iconv1.c

@@ -5,8 +5,8 @@

 #include <stdio.h>

 #include <string.h>

-int

-main (void)

+static int

+do_test (void)

 {

   char utf8[5];

   wchar_t ucs4[5];

@@ -42,3 +42,6 @@ main (void)

   return 0;

 }

+

+#define TEST_FUNCTION do_test ()

+#include "../test-skeleton.c"

diff --git a/iconv/tst-iconv2.c b/iconv/tst-iconv2.c

index 5036ad1..0672a51 100644

--- a/iconv/tst-iconv2.c

+++ b/iconv/tst-iconv2.c

@@ -25,8 +25,8 @@

 #include <string.h>

-int

-main (void)

+static int

+do_test (void)

 {

   char buf[3];

   const wchar_t wc[1] = L"a";

@@ -97,3 +97,6 @@ main (void)

   return result;

 }

+

+#define TEST_FUNCTION do_test ()

+#include "../test-skeleton.c"

diff --git a/iconvdata/tst-e2big.c b/iconvdata/tst-e2big.c

index 9533eb0..8de64b2 100644

--- a/iconvdata/tst-e2big.c

+++ b/iconvdata/tst-e2big.c

@@ -95,10 +95,13 @@ test_tscii (void)

   test ("TSCII", inbuf, sizeof (inbuf), 9);

 }

-int

-main (void)

+static int

+do_test (void)

 {

   test_euc_jisx0213 ();

   test_tscii ();

   return 0;

 }

+

+#define TEST_FUNCTION do_test ()

+#include "../test-skeleton.c"

diff --git a/iconvdata/tst-loading.c b/iconvdata/tst-loading.c

index 0d8a959..eff9d78 100644

--- a/iconvdata/tst-loading.c

+++ b/iconvdata/tst-loading.c

@@ -114,8 +114,8 @@ static const char inbuf[] =

 "     function.  Later modifications of the variable have no effect.\n";

-int

-main (void)

+static int

+do_test (void)

 {

   size_t count = TEST_ROUNDS;

   int result = 0;

@@ -180,3 +180,6 @@ main (void)

   return result;

 }

+

+#define TEST_FUNCTION do_test ()

+#include "../test-skeleton.c"

diff --git a/inet/test-inet6_opt.c b/inet/test-inet6_opt.c

index 3bf319e..a7ebf00 100644

--- a/inet/test-inet6_opt.c

+++ b/inet/test-inet6_opt.c

@@ -194,8 +194,8 @@ decode_inet6_opt (void *eb, socklen_t el)

   return ret;

 }

-int

-main (void)

+static int

+do_test (void)

 {

   void *eb;

   socklen_t el;

@@ -206,3 +206,6 @@ main (void)

     return 1;

   return 0;

 }

+

+#define TEST_FUNCTION do_test ()

+#include "../test-skeleton.c"

diff --git a/inet/tst-gethnm.c b/inet/tst-gethnm.c

index 8af44d6..dd3a547 100644

--- a/inet/tst-gethnm.c

+++ b/inet/tst-gethnm.c

@@ -10,8 +10,8 @@

 #include <netinet/in.h>

 #include <arpa/inet.h>

-int

-main (void)

+static int

+do_test (void)

 {

   struct hostent *ent;

   struct in_addr hostaddr;

@@ -62,3 +62,6 @@ main (void)

   return result;

 }

+

+#define TEST_FUNCTION do_test ()

+#include "../test-skeleton.c"

diff --git a/inet/tst-network.c b/inet/tst-network.c

index fc90bd7..cc840e0 100644

--- a/inet/tst-network.c

+++ b/inet/tst-network.c

@@ -51,8 +51,8 @@ struct

 };

-int

-main (void)

+static int

+do_test (void)

 {

   int errors = 0;

   size_t i;

@@ -76,3 +76,6 @@ main (void)

   return errors != 0;

 }

+

+#define TEST_FUNCTION do_test ()

+#include "../test-skeleton.c"

diff --git a/inet/tst-ntoa.c b/inet/tst-ntoa.c

index 9be91eb..ef82d4d 100644

--- a/inet/tst-ntoa.c

+++ b/inet/tst-ntoa.c

@@ -22,8 +22,8 @@ test (unsigned int inaddr, const char *expected)

 }

-int

-main (void)

+static int

+do_test (void)

 {

   int result = 0;

@@ -34,3 +34,6 @@ main (void)

   return result;

 }

+

+#define TEST_FUNCTION do_test ()

+#include "../test-skeleton.c"

diff --git a/intl/tst-codeset.c b/intl/tst-codeset.c

index f5b37ec..37f731e 100644

--- a/intl/tst-codeset.c

+++ b/intl/tst-codeset.c

@@ -23,8 +23,8 @@

 #include <stdlib.h>

 #include <string.h>

-int

-main (void)

+static int

+do_test (void)

 {

   char *s;

   int result = 0;

@@ -55,3 +55,6 @@ main (void)

   return result;

 }

+

+#define TEST_FUNCTION do_test ()

+#include "../test-skeleton.c"

diff --git a/intl/tst-gettext2.c b/intl/tst-gettext2.c

index 075680a..3c44165 100644

--- a/intl/tst-gettext2.c

+++ b/intl/tst-gettext2.c

@@ -40,8 +40,8 @@ struct data_t strings[] =

 const int lang_cnt = 3;

 const char *lang[] = {"lang1", "lang2", "lang3"};

-int

-main (void)

+static int

+do_test (void)

 {

   int i;

@@ -70,3 +70,6 @@ main (void)

   return 0;

 }

+

+#define TEST_FUNCTION do_test ()

+#include "../test-skeleton.c"

diff --git a/intl/tst-gettext3.c b/intl/tst-gettext3.c

index dd88987..11e9b08 100644

--- a/intl/tst-gettext3.c

+++ b/intl/tst-gettext3.c

@@ -24,8 +24,8 @@

 #include <stdlib.h>

 #include <string.h>

-int

-main (void)

+static int

+do_test (void)

 {

   char *s;

   int result = 0;

@@ -57,3 +57,6 @@ main (void)

   return result;

 }

+

+#define TEST_FUNCTION do_test ()

+#include "../test-skeleton.c"

diff --git a/intl/tst-ngettext.c b/intl/tst-ngettext.c

index 4fb0ca2..71e91b9 100644

--- a/intl/tst-ngettext.c

+++ b/intl/tst-ngettext.c

@@ -25,8 +25,8 @@

 #include <string.h>

-int

-main (void)

+static int

+do_test (void)

 {

   const char *strs[2] = { "singular", "plural" };

   unsigned long int i;

@@ -63,3 +63,6 @@ main (void)

   return res;

 }

+

+#define TEST_FUNCTION do_test ()

+#include "../test-skeleton.c"

diff --git a/intl/tst-translit.c b/intl/tst-translit.c

index 1aecee7..299fa40 100644

--- a/intl/tst-translit.c

+++ b/intl/tst-translit.c

@@ -24,8 +24,8 @@

 #include <string.h>

 #include <unistd.h>

-int

-main (void)

+static int

+do_test (void)

 {

   int result = 0;

   const char *s;

@@ -49,3 +49,6 @@ main (void)

   return result;

 }

+

+#define TEST_FUNCTION do_test ()

+#include "../test-skeleton.c"

diff --git a/io/test-stat.c b/io/test-stat.c

index c5cfd26..e9c8468 100644

--- a/io/test-stat.c

+++ b/io/test-stat.c

@@ -25,8 +25,8 @@

 #include <stddef.h>

 #include <sys/stat.h>

-int

-main (void)

+static int

+do_test (void)

 {

   /* With _FILE_OFFSET_BITS=64 struct stat and struct stat64 should

      be identical.  */

@@ -65,3 +65,6 @@ main (void)

 #endif

   return 0;

 }

+

+#define TEST_FUNCTION do_test ()

+#include "../test-skeleton.c"

diff --git a/libio/test-fmemopen.c b/libio/test-fmemopen.c

index 3099894..211176e 100644

--- a/libio/test-fmemopen.c

+++ b/libio/test-fmemopen.c

@@ -22,8 +22,8 @@ static char buffer[] = "foobar";

 #include <stdio.h>

 #include <string.h>

-int

-main (void)

+static int

+do_test (void)

 {

   int ch;

   FILE *stream;

@@ -37,3 +37,6 @@ main (void)

   return 0;

 }

+

+#define TEST_FUNCTION do_test ()

+#include "../test-skeleton.c"

diff --git a/libio/tst-freopen.c b/libio/tst-freopen.c

index f9e7177..94284ec 100644

--- a/libio/tst-freopen.c

+++ b/libio/tst-freopen.c

@@ -22,8 +22,8 @@

 #include <string.h>

 #include <unistd.h>

-int

-main (void)

+static int

+do_test (void)

 {