Use test-skeleton.c.

diff --git a/argp/tst-argp1.c b/argp/tst-argp1.c
index c72185e..2367d21 100644 (file)
--- a/argp/tst-argp1.c
+++ b/argp/tst-argp1.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002 Free Software Foundation, Inc.
+/* Copyright (C) 2002, 2003 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
 
@@ -29,7 +29,7 @@
 #define OPT_TOPLEVEL           304
 
 
-static const struct argp_option options[] =
+static const struct argp_option test_options[] =
   {
     { NULL, 0, NULL, 0, "\
 This is a test for threads so we allow ther user to selection the number of \
@@ -89,12 +89,12 @@ static error_t parse_opt (int key, char *arg, struct argp_state *state);
 /* Data structure to communicate with argp functions.  */
 static struct argp argp =
 {
-  options, parse_opt
+  test_options, parse_opt
 };
 
 
-int
-main (void)
+static int
+do_test (void)
 {
   int argc = 2;
   char *argv[3] = { (char *) "tst-argp1", (char *) "--help", NULL };
@@ -113,3 +113,6 @@ parse_opt (int key, char *arg, struct argp_state *state)
 {
   return ARGP_ERR_UNKNOWN;
 }
+
+#define TEST_FUNCTION do_test ()
+#include "../test-skeleton.c"

diff --git a/locale/tst-C-locale.c b/locale/tst-C-locale.c
index 78ea90f..d568b55 100644 (file)
--- a/locale/tst-C-locale.c
+++ b/locale/tst-C-locale.c
@@ -1,5 +1,5 @@
 /* Tests of C and POSIX locale contents.
-   Copyright (C) 2000,01,02 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@redhat.com>, 2000.
 
@@ -450,8 +450,8 @@ run_test (const char *locname)
 }
 
 
-int
-main (void)
+static int
+do_test (void)
 {
   int result;
 
@@ -475,3 +475,6 @@ main (void)
 
   return result;
 }
+
+#define TEST_FUNCTION do_test ()
+#include "../test-skeleton.c"