Update elf tests to use the support test driver.

Replaced test-skeleton.c with support/test-driver.c and
adjusted the tests accordinly.

Checked on x86_64.

	* elf/next.c: Import support/test-driver.c instead of
	test-skeleton.c and delete TEST_FUNCTION macro definition.
	* elf/nodelete.c: Likewise.
	* elf/order2.c: Likewise.
	* elf/tst-_dl_addr_inside_object.c: Likewise.
	* elf/tst-addr1.c: Likewise.
	* elf/tst-align.c: Likewise.
	* elf/tst-align2.c: Likewise.
	* elf/tst-audit11.c: Likewise.
	* elf/tst-audit12.c: Likewise.
	* elf/tst-audit2.c: Likewise.
	* elf/tst-audit9.c: Likewise.
	* elf/tst-auxv.c: Likewise and define
	TEST_FUNCTION_ARGV macro.
	* elf/tst-deep1.c: Likewise.
	* elf/tst-dl-iter-static.c: Likewise.
	* elf/tst-dlmodcount.c: Likewise.
	* elf/tst-dlmopen1.c: Likewise.
	* elf/tst-dlmopen2.c: Likewise.
	* elf/tst-dlmopen3.c: Likewise.
	* elf/tst-dlopen-aout.c: Likewise.
	* elf/tst-dlopenrpath.c: Likewise.
	* elf/tst-dlsym-error.c: Likewise.
	* elf/tst-execstack-needed.c: Likewise.
	* elf/tst-execstack-prog.c: Likewise.
	* elf/tst-execstack.c: Likewise.
	* elf/tst-global1.c: Likewise.
	* elf/tst-gnu2-tls1.c: Likewise.
	* elf/tst-latepthread.c: Likewise.
	* elf/tst-leaks1.c: Likewise.
	* elf/tst-linkall-static.c: Likewise.
	(do_test): New function.
	* elf/tst-nodelete-opened.c: Likewise.
	* elf/tst-nodelete.cc: Likewise.
	* elf/tst-nodelete2.c: Likewise.
	* elf/tst-noload.c: Likewise.
	* elf/tst-null-argv.c: Likewise and define
	TEST_FUNCTION_ARGV marcro.
	* elf/tst-order-main.c: Likewise.
	* elf/tst-pathopt.c: Likewise.
	* elf/tst-pie2.c: Likewise.
	* elf/tst-piemod1.c: Likewise.
	* elf/tst-prelink.c: Likewise.
	* elf/tst-protected1a.c: Likewise.
	* elf/tst-protected1b.c: Likewise.
	* elf/tst-ptrguard1.c: Likewise, import getopt.h,
	and define _GNU_SOURCE macro.
	(cmdline_process_function): New function.
	* elf/tst-relsort1.c: Likewise.
	* elf/tst-stackguard1.c: Likewise, import getopt.h,
	and define _GNU_SOURCE macro.
	(cmdline_process_function): New function.
	* elf/tst-thrlock.c: Likewise.
	* elf/tst-tls-dlinfo.c: Likewise.
	* elf/tst-tls-manydynamic.c: Likewise and import
	support/xthread.h.
	* elf/tst-tls1.c: Likewise.
	* elf/tst-tls10.c: Likewise.
	* elf/tst-tls11.c: Likewise.
	* elf/tst-tls12.c: Likewise.
	* elf/tst-tls13.c: Likewise.
	* elf/tst-tls14.c: Likewise.
	* elf/tst-tls15.c: Likewise.
	* elf/tst-tls16.c: Likewise.
	* elf/tst-tls17.c: Likewise.
	* elf/tst-tls18.c: Likewise.
	* elf/tst-tls19.c: Likewise.
	* elf/tst-tls2.c: Likewise.
	* elf/tst-tls3.c: Likewise.
	* elf/tst-tls4.c: Likewise.
	* elf/tst-tls5.c: Likewise.
	* elf/tst-tls6.c: Likewise.
	* elf/tst-tls7.c: Likewise.
	* elf/tst-tls8.c: Likewise.
	* elf/tst-tls9.c: Likewise.
	* elf/tst-tlsalign-extern.c: Likewise.
	* elf/tst-tlsalign.c: Likewise.
	* elf/tst-unique1.c: Likewise.
	* elf/tst-unique2.c: Likewise.
	* elf/vismain.c: Likewise.
This commit is contained in:
Wainer dos Santos Moschetta 2017-04-05 10:34:39 -03:00 committed by Tulio Magno Quites Machado Filho
parent ff65c87443
commit 36fe25fd0e
72 changed files with 202 additions and 159 deletions

View File

@ -1,3 +1,83 @@
2017-04-05 Wainer dos Santos Moschetta <wainersm@linux.vnet.ibm.com>
* elf/next.c: Import support/test-driver.c instead of
test-skeleton.c and delete TEST_FUNCTION macro definition.
* elf/nodelete.c: Likewise.
* elf/order2.c: Likewise.
* elf/tst-_dl_addr_inside_object.c: Likewise.
* elf/tst-addr1.c: Likewise.
* elf/tst-align.c: Likewise.
* elf/tst-align2.c: Likewise.
* elf/tst-audit11.c: Likewise.
* elf/tst-audit12.c: Likewise.
* elf/tst-audit2.c: Likewise.
* elf/tst-audit9.c: Likewise.
* elf/tst-auxv.c: Likewise and define TEST_FUNCTION_ARGV macro.
* elf/tst-deep1.c: Likewise.
* elf/tst-dl-iter-static.c: Likewise.
* elf/tst-dlmodcount.c: Likewise.
* elf/tst-dlmopen1.c: Likewise.
* elf/tst-dlmopen2.c: Likewise.
* elf/tst-dlmopen3.c: Likewise.
* elf/tst-dlopen-aout.c: Likewise.
* elf/tst-dlopenrpath.c: Likewise.
* elf/tst-dlsym-error.c: Likewise.
* elf/tst-execstack-needed.c: Likewise.
* elf/tst-execstack-prog.c: Likewise.
* elf/tst-execstack.c: Likewise.
* elf/tst-global1.c: Likewise.
* elf/tst-gnu2-tls1.c: Likewise.
* elf/tst-latepthread.c: Likewise.
* elf/tst-leaks1.c: Likewise.
* elf/tst-linkall-static.c: Likewise.
(do_test): New function.
* elf/tst-nodelete-opened.c: Likewise.
* elf/tst-nodelete.cc: Likewise.
* elf/tst-nodelete2.c: Likewise.
* elf/tst-noload.c: Likewise.
* elf/tst-null-argv.c: Likewise and define TEST_FUNCTION_ARGV marcro.
* elf/tst-order-main.c: Likewise.
* elf/tst-pathopt.c: Likewise.
* elf/tst-pie2.c: Likewise.
* elf/tst-piemod1.c: Likewise.
* elf/tst-prelink.c: Likewise.
* elf/tst-protected1a.c: Likewise.
* elf/tst-protected1b.c: Likewise.
* elf/tst-ptrguard1.c: Likewise, import getopt.h,
and define _GNU_SOURCE macro.
(cmdline_process_function): New function.
* elf/tst-relsort1.c: Likewise.
* elf/tst-stackguard1.c: Likewise, import getopt.h,
and define _GNU_SOURCE macro.
(cmdline_process_function): New function.
* elf/tst-thrlock.c: Likewise.
* elf/tst-tls-dlinfo.c: Likewise.
* elf/tst-tls-manydynamic.c: Likewise and import support/xthread.h.
* elf/tst-tls1.c: Likewise.
* elf/tst-tls10.c: Likewise.
* elf/tst-tls11.c: Likewise.
* elf/tst-tls12.c: Likewise.
* elf/tst-tls13.c: Likewise.
* elf/tst-tls14.c: Likewise.
* elf/tst-tls15.c: Likewise.
* elf/tst-tls16.c: Likewise.
* elf/tst-tls17.c: Likewise.
* elf/tst-tls18.c: Likewise.
* elf/tst-tls19.c: Likewise.
* elf/tst-tls2.c: Likewise.
* elf/tst-tls3.c: Likewise.
* elf/tst-tls4.c: Likewise.
* elf/tst-tls5.c: Likewise.
* elf/tst-tls6.c: Likewise.
* elf/tst-tls7.c: Likewise.
* elf/tst-tls8.c: Likewise.
* elf/tst-tls9.c: Likewise.
* elf/tst-tlsalign-extern.c: Likewise.
* elf/tst-tlsalign.c: Likewise.
* elf/tst-unique1.c: Likewise.
* elf/tst-unique2.c: Likewise.
* elf/vismain.c: Likewise.
2017-04-05 Wainer dos Santos Moschetta <wainersm@linux.vnet.ibm.com> 2017-04-05 Wainer dos Santos Moschetta <wainersm@linux.vnet.ibm.com>
* string/test-strnlen.c (do_page_tests): New function * string/test-strnlen.c (do_page_tests): New function

View File

@ -40,5 +40,4 @@ do_test (void)
return result; return result;
} }
#define TEST_FUNCTION do_test () #include <support/test-driver.c>
#include "../test-skeleton.c"

View File

@ -18,7 +18,6 @@ handler (int sig)
} }
#define TEST_FUNCTION do_test ()
static int static int
do_test (void) do_test (void)
{ {
@ -208,4 +207,4 @@ do_test (void)
return result; return result;
} }
#include "../test-skeleton.c" #include <support/test-driver.c>

View File

@ -34,8 +34,7 @@ do_test (void)
return 0; return 0;
} }
#define TEST_FUNCTION do_test () #include <support/test-driver.c>
#include "../test-skeleton.c"
static void static void
__attribute__ ((destructor)) __attribute__ ((destructor))

View File

@ -219,5 +219,4 @@ do_test (void)
return err; return err;
} }
#define TEST_FUNCTION do_test () #include <support/test-driver.c>
#include "../test-skeleton.c"

View File

@ -22,5 +22,4 @@ do_test (void)
&& strcmp (i.dli_sname, "_IO_printf") != 0); && strcmp (i.dli_sname, "_IO_printf") != 0);
} }
#define TEST_FUNCTION do_test () #include <support/test-driver.c>
#include "../test-skeleton.c"

View File

@ -49,5 +49,4 @@ do_test (void)
return result; return result;
} }
#define TEST_FUNCTION do_test () #include <support/test-driver.c>
#include "../test-skeleton.c"

View File

@ -152,5 +152,4 @@ do_test (void)
return result; return result;
} }
#define TEST_FUNCTION do_test () #include <support/test-driver.c>
#include "../test-skeleton.c"

View File

@ -32,5 +32,4 @@ do_test (void)
return 0; return 0;
} }
#define TEST_FUNCTION do_test () #include <support/test-driver.c>
#include "../test-skeleton.c"

View File

@ -45,5 +45,4 @@ do_test (void)
return 0; return 0;
} }
#define TEST_FUNCTION do_test () #include <support/test-driver.c>
#include "../test-skeleton.c"

View File

@ -57,5 +57,4 @@ do_test (void)
return 0; return 0;
} }
#define TEST_FUNCTION do_test () #include <support/test-driver.c>
#include "../test-skeleton.c"

View File

@ -8,5 +8,4 @@ do_test (void)
return fp() - 1; return fp() - 1;
} }
#define TEST_FUNCTION do_test () #include <support/test-driver.c>
#include "../test-skeleton.c"

View File

@ -66,4 +66,5 @@ do_test (int argc, char *argv[])
return 0; return 0;
} }
#include "../test-skeleton.c" #define TEST_FUNCTION_ARGV do_test
#include <support/test-driver.c>

View File

@ -32,5 +32,4 @@ do_test (void)
return foo () + f (); return foo () + f ();
} }
#define TEST_FUNCTION do_test () #include <support/test-driver.c>
#include "../test-skeleton.c"

View File

@ -43,5 +43,4 @@ do_test (void)
return status || count != 1; return status || count != 1;
} }
#define TEST_FUNCTION do_test () #include <support/test-driver.c>
#include "../test-skeleton.c"

View File

@ -105,5 +105,4 @@ do_test (void)
return 0; return 0;
} }
#define TEST_FUNCTION do_test () #include <support/test-driver.c>
#include "../test-skeleton.c"

View File

@ -77,5 +77,4 @@ do_test (void)
return 0; return 0;
} }
#define TEST_FUNCTION do_test () #include <support/test-driver.c>
#include "../test-skeleton.c"

View File

@ -66,5 +66,4 @@ round %d, namespace %d: duplicate allocate of namespace %ld",
return result; return result;
} }
#define TEST_FUNCTION do_test () #include <support/test-driver.c>
#include "../test-skeleton.c"

View File

@ -18,5 +18,4 @@ do_test (void)
return 0; return 0;
} }
#define TEST_FUNCTION do_test () #include <support/test-driver.c>
#include "../test-skeleton.c"

View File

@ -64,4 +64,4 @@ do_test (int argc, char *argv[])
} }
#define TEST_FUNCTION do_test (argc, argv) #define TEST_FUNCTION do_test (argc, argv)
#include "../test-skeleton.c" #include <support/test-driver.c>

View File

@ -67,5 +67,4 @@ do_test (void)
return result; return result;
} }
#define TEST_FUNCTION do_test () #include <support/test-driver.c>
#include "../test-skeleton.c"

View File

@ -110,5 +110,4 @@ do_test (void)
} }
#define TEST_FUNCTION do_test () #include <support/test-driver.c>
#include "../test-skeleton.c"

View File

@ -31,6 +31,4 @@ deeper (void (*f) (void))
memfrob (stack, sizeof stack); memfrob (stack, sizeof stack);
} }
#include <support/test-driver.c>
#define TEST_FUNCTION do_test ()
#include "../test-skeleton.c"

View File

@ -30,6 +30,4 @@ deeper (void (*f) (void))
memfrob (stack, sizeof stack); memfrob (stack, sizeof stack);
} }
#include <support/test-driver.c>
#define TEST_FUNCTION do_test ()
#include "../test-skeleton.c"

View File

@ -233,5 +233,4 @@ deeper (void (*f) (void))
} }
#define TEST_FUNCTION do_test () #include <support/test-driver.c>
#include "../test-skeleton.c"

View File

@ -35,5 +35,4 @@ do_test (void)
return 0; return 0;
} }
#define TEST_FUNCTION do_test () #include <support/test-driver.c>
#include "../test-skeleton.c"

View File

@ -48,5 +48,4 @@ do_test (void)
return 0; return 0;
} }
#define TEST_FUNCTION do_test () #include <support/test-driver.c>
#include "../test-skeleton.c"

View File

@ -101,5 +101,4 @@ do_test (void)
return 0; return 0;
} }
#define TEST_FUNCTION do_test () #include <support/test-driver.c>
#include "../test-skeleton.c"

View File

@ -24,5 +24,4 @@ do_test (void)
return ret; return ret;
} }
#define TEST_FUNCTION do_test () #include <support/test-driver.c>
#include "../test-skeleton.c"

View File

@ -42,6 +42,11 @@ void *references[] =
&getaddrinfo_a, /* libanl */ &getaddrinfo_a, /* libanl */
}; };
/* This is a link-time test. There is nothing to run here. */ static int
#define TEST_FUNCTION 0 do_test (void)
#include "../test-skeleton.c" {
/* This is a link-time test. There is nothing to run here. */
return 0;
}
#include <support/test-driver.c>

View File

@ -65,5 +65,4 @@ do_test (void)
return 0; return 0;
} }
#define TEST_FUNCTION do_test () #include <support/test-driver.c>
#include "../test-skeleton.c"

View File

@ -47,5 +47,4 @@ do_test (void)
return result; return result;
} }
#define TEST_FUNCTION do_test () #include <support/test-driver.c>
#include "../test-skeleton.c"

View File

@ -33,5 +33,4 @@ do_test (void)
return result; return result;
} }
#define TEST_FUNCTION do_test () #include <support/test-driver.c>
#include "../test-skeleton.c"

View File

@ -69,5 +69,4 @@ do_test (void)
return 0; return 0;
} }
#define TEST_FUNCTION do_test () #include <support/test-driver.c>
#include "../test-skeleton.c"

View File

@ -32,4 +32,5 @@ do_test (int argc, char **argv)
return 0; return 0;
} }
#include <test-skeleton.c> #define TEST_FUNCTION_ARGV do_test
#include <support/test-driver.c>

View File

@ -9,5 +9,4 @@ do_test (void)
exit(EXIT_SUCCESS); exit(EXIT_SUCCESS);
} }
#define TEST_FUNCTION do_test () #include <support/test-driver.c>
#include "../test-skeleton.c"

View File

@ -38,5 +38,4 @@ do_test (void)
return result; return result;
} }
#define TEST_FUNCTION do_test () #include <support/test-driver.c>
#include "../test-skeleton.c"

View File

@ -37,5 +37,4 @@ do_test (void)
return 0; return 0;
} }
#define TEST_FUNCTION do_test () #include <support/test-driver.c>
#include "../test-skeleton.c"

View File

@ -19,5 +19,4 @@ do_test (void)
return 0; return 0;
} }
#define TEST_FUNCTION do_test () #include <support/test-driver.c>
#include "../test-skeleton.c"

View File

@ -26,5 +26,4 @@ do_test (void)
return 0; return 0;
} }
#define TEST_FUNCTION do_test () #include <support/test-driver.c>
#include "../test-skeleton.c"

View File

@ -40,10 +40,8 @@ extern int do_test (void);
int protected2 = -1; int protected2 = -1;
#define TEST_FUNCTION do_test ()
/* This defines the `main' function and some more. */ /* This defines the `main' function and some more. */
#include <test-skeleton.c> #include <support/test-driver.c>
int int
do_test (void) do_test (void)

View File

@ -40,10 +40,8 @@ extern int do_test (void);
int protected2 = -1; int protected2 = -1;
#define TEST_FUNCTION do_test ()
/* This defines the `main' function and some more. */ /* This defines the `main' function and some more. */
#include <test-skeleton.c> #include <support/test-driver.c>
int int
do_test (void) do_test (void)

View File

@ -25,6 +25,12 @@
#include <tls.h> #include <tls.h>
#include <unistd.h> #include <unistd.h>
#ifndef _GNU_SOURCE
#define _GNU_SOURCE
#endif
/* Requires _GNU_SOURCE */
#include <getopt.h>
#ifndef POINTER_CHK_GUARD #ifndef POINTER_CHK_GUARD
extern uintptr_t __pointer_chk_guard; extern uintptr_t __pointer_chk_guard;
# define POINTER_CHK_GUARD __pointer_chk_guard # define POINTER_CHK_GUARD __pointer_chk_guard
@ -191,12 +197,21 @@ do_test (void)
#define CMDLINE_OPTIONS \ #define CMDLINE_OPTIONS \
{ "command", required_argument, NULL, OPT_COMMAND }, \ { "command", required_argument, NULL, OPT_COMMAND }, \
{ "child", no_argument, NULL, OPT_CHILD }, { "child", no_argument, NULL, OPT_CHILD },
#define CMDLINE_PROCESS \
case OPT_COMMAND: \ static void __attribute((used))
command = optarg; \ cmdline_process_function (int c)
break; \ {
case OPT_CHILD: \ switch (c)
child = true; \ {
break; case OPT_COMMAND:
#define TEST_FUNCTION do_test () command = optarg;
#include "../test-skeleton.c" break;
case OPT_CHILD:
child = true;
break;
}
}
#define CMDLINE_PROCESS cmdline_process_function
#include <support/test-driver.c>

View File

@ -15,5 +15,4 @@ do_test (void)
return 0; return 0;
} }
#define TEST_FUNCTION do_test () #include <support/test-driver.c>
#include "../test-skeleton.c"

View File

@ -17,6 +17,7 @@
<http://www.gnu.org/licenses/>. */ <http://www.gnu.org/licenses/>. */
#include <errno.h> #include <errno.h>
#include <getopt.h>
#include <stdbool.h> #include <stdbool.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
@ -185,12 +186,20 @@ do_test (void)
#define CMDLINE_OPTIONS \ #define CMDLINE_OPTIONS \
{ "command", required_argument, NULL, OPT_COMMAND }, \ { "command", required_argument, NULL, OPT_COMMAND }, \
{ "child", no_argument, NULL, OPT_CHILD }, { "child", no_argument, NULL, OPT_CHILD },
#define CMDLINE_PROCESS \
case OPT_COMMAND: \ static void __attribute__((used))
command = optarg; \ cmdline_process_function (int c)
break; \ {
case OPT_CHILD: \ switch (c)
child = true; \ {
break; case OPT_COMMAND:
#define TEST_FUNCTION do_test () command = optarg;
#include "../test-skeleton.c" break;
case OPT_CHILD:
child = true;
break;
}
}
#define CMDLINE_PROCESS cmdline_process_function
#include <support/test-driver.c>

View File

@ -55,5 +55,4 @@ do_test (void)
return 0; return 0;
} }
#define TEST_FUNCTION do_test () #include <support/test-driver.c>
#include "../test-skeleton.c"

View File

@ -3,7 +3,6 @@
#include <stdlib.h> #include <stdlib.h>
#define TEST_FUNCTION do_test ()
static int static int
do_test (void) do_test (void)
{ {
@ -83,4 +82,4 @@ do_test (void)
} }
#include "../test-skeleton.c" #include <support/test-driver.c>

View File

@ -24,6 +24,7 @@
#include "tst-tls-manydynamic.h" #include "tst-tls-manydynamic.h"
#include <errno.h>
#include <dlfcn.h> #include <dlfcn.h>
#include <pthread.h> #include <pthread.h>
#include <stdio.h> #include <stdio.h>
@ -31,8 +32,8 @@
#include <string.h> #include <string.h>
static int do_test (void); static int do_test (void);
#define TEST_FUNCTION do_test () #include <support/xthread.h>
#include "../test-skeleton.c" #include <support/test-driver.c>
void *handles[COUNT]; void *handles[COUNT];
set_value_func set_value_funcs[COUNT]; set_value_func set_value_funcs[COUNT];

View File

@ -9,7 +9,6 @@ COMMON_INT_DEF(foo);
COMMON_INT_DEF(bar); COMMON_INT_DEF(bar);
#define TEST_FUNCTION do_test ()
static int static int
do_test (void) do_test (void)
{ {
@ -80,4 +79,4 @@ do_test (void)
} }
#include "../test-skeleton.c" #include <support/test-driver.c>

View File

@ -36,5 +36,4 @@ do_test (void)
exit (0); exit (0);
} }
#define TEST_FUNCTION do_test () #include <support/test-driver.c>
#include "../test-skeleton.c"

View File

@ -25,5 +25,4 @@ do_test (void)
exit (0); exit (0);
} }
#define TEST_FUNCTION do_test () #include <support/test-driver.c>
#include "../test-skeleton.c"

View File

@ -16,5 +16,4 @@ do_test (void)
exit (0); exit (0);
} }
#define TEST_FUNCTION do_test () #include <support/test-driver.c>
#include "../test-skeleton.c"

View File

@ -25,5 +25,4 @@ do_test (void)
return 0; return 0;
} }
#define TEST_FUNCTION do_test () #include <support/test-driver.c>
#include "../test-skeleton.c"

View File

@ -51,5 +51,4 @@ do_test (void)
return result; return result;
} }
#define TEST_FUNCTION do_test () #include <support/test-driver.c>
#include "../test-skeleton.c"

View File

@ -29,5 +29,4 @@ do_test (void)
return fp (); return fp ();
} }
#define TEST_FUNCTION do_test () #include <support/test-driver.c>
#include "../test-skeleton.c"

View File

@ -49,5 +49,4 @@ do_test (void)
return 0; return 0;
} }
#define TEST_FUNCTION do_test () #include <support/test-driver.c>
#include "../test-skeleton.c"

View File

@ -25,5 +25,4 @@ do_test (void)
return 0; return 0;
} }
#define TEST_FUNCTION do_test () #include <support/test-driver.c>
#include "../test-skeleton.c"

View File

@ -34,5 +34,4 @@ do_test (void)
return 0; return 0;
} }
#define TEST_FUNCTION do_test () #include <support/test-driver.c>
#include "../test-skeleton.c"

View File

@ -23,5 +23,4 @@ do_test (void)
return fn (); return fn ();
} }
#define TEST_FUNCTION do_test () #include <support/test-driver.c>
#include "../test-skeleton.c"

View File

@ -9,7 +9,6 @@ VAR_INT_DEF(foo);
VAR_INT_DEF(bar); VAR_INT_DEF(bar);
#define TEST_FUNCTION do_test ()
static int static int
do_test (void) do_test (void)
{ {
@ -80,4 +79,4 @@ do_test (void)
} }
#include "../test-skeleton.c" #include <support/test-driver.c>

View File

@ -13,7 +13,6 @@ VAR_INT_DEF(baz);
extern int in_dso (void); extern int in_dso (void);
#define TEST_FUNCTION do_test ()
static int static int
do_test (void) do_test (void)
{ {
@ -65,4 +64,4 @@ do_test (void)
} }
#include "../test-skeleton.c" #include <support/test-driver.c>

View File

@ -3,7 +3,6 @@
#include <stdlib.h> #include <stdlib.h>
#define TEST_FUNCTION do_test ()
static int static int
do_test (void) do_test (void)
{ {
@ -47,4 +46,4 @@ do_test (void)
} }
#include "../test-skeleton.c" #include <support/test-driver.c>

View File

@ -3,7 +3,6 @@
#include <stdlib.h> #include <stdlib.h>
#define TEST_FUNCTION do_test ()
static int static int
do_test (void) do_test (void)
{ {
@ -63,4 +62,4 @@ do_test (void)
} }
#include "../test-skeleton.c" #include <support/test-driver.c>

View File

@ -5,7 +5,6 @@
#include <link.h> #include <link.h>
#define TEST_FUNCTION do_test ()
static int static int
do_test (void) do_test (void)
{ {
@ -82,4 +81,4 @@ do_test (void)
} }
#include "../test-skeleton.c" #include <support/test-driver.c>

View File

@ -5,7 +5,6 @@
#include <link.h> #include <link.h>
#define TEST_FUNCTION do_test ()
static int static int
do_test (void) do_test (void)
{ {
@ -53,4 +52,4 @@ do_test (void)
} }
#include "../test-skeleton.c" #include <support/test-driver.c>

View File

@ -5,7 +5,6 @@
#include <link.h> #include <link.h>
#define TEST_FUNCTION do_test ()
static int static int
do_test (void) do_test (void)
{ {
@ -165,5 +164,4 @@ do_test (void)
return result; return result;
} }
#include <support/test-driver.c>
#include "../test-skeleton.c"

View File

@ -4,7 +4,6 @@
#include <link.h> #include <link.h>
#define TEST_FUNCTION do_test ()
static int static int
do_test (void) do_test (void)
{ {
@ -34,4 +33,4 @@ do_test (void)
} }
#include "../test-skeleton.c" #include <support/test-driver.c>

View File

@ -70,5 +70,4 @@ do_test (void)
return fail ? EXIT_FAILURE : EXIT_SUCCESS; return fail ? EXIT_FAILURE : EXIT_SUCCESS;
} }
#define TEST_FUNCTION do_test () #include <support/test-driver.c>
#include "../test-skeleton.c"

View File

@ -81,5 +81,4 @@ do_test (void)
return fail ? EXIT_FAILURE : EXIT_SUCCESS; return fail ? EXIT_FAILURE : EXIT_SUCCESS;
} }
#define TEST_FUNCTION do_test () #include <support/test-driver.c>
#include "../test-skeleton.c"

View File

@ -70,5 +70,4 @@ do_test (void)
return 0; return 0;
} }
#define TEST_FUNCTION do_test () #include <support/test-driver.c>
#include "../test-skeleton.c"

View File

@ -24,5 +24,4 @@ do_test (void)
return f (&var); return f (&var);
} }
#define TEST_FUNCTION do_test () #include <support/test-driver.c>
#include "../test-skeleton.c"

View File

@ -29,10 +29,9 @@
/* Prototype for our test function. */ /* Prototype for our test function. */
extern int do_test (void); extern int do_test (void);
#define TEST_FUNCTION do_test ()
/* This defines the `main' function and some more. */ /* This defines the `main' function and some more. */
#include <test-skeleton.c> #include <support/test-driver.c>
/* Prototypes for local functions. */ /* Prototypes for local functions. */