summaryrefslogtreecommitdiff
path: root/wcsmbs
diff options
context:
space:
mode:
Diffstat (limited to 'wcsmbs')
-rw-r--r--wcsmbs/tst-btowc.c7
-rw-r--r--wcsmbs/tst-mbrtowc.c7
-rw-r--r--wcsmbs/tst-mbsrtowcs.c7
-rw-r--r--wcsmbs/tst-wchar-h.c7
-rw-r--r--wcsmbs/tst-wcpncpy.c7
-rw-r--r--wcsmbs/tst-wcrtomb.c7
-rw-r--r--wcsmbs/tst-wcsnlen.c7
-rw-r--r--wcsmbs/tst-wcstof.c7
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"