Replaced all imports of test-skeleton.c with support/test-driver.c.
In some cases it was needed to adjust do_test to return int
instead of static int since that is the method's signature expected by
test-driver.c.
Checked on x86_64.
* string/test-string.h (TEST_FUNCTION): Use test_main instead of
test_main ().
(CMDLINE_PROCESS): Use function instead of defined macro.
* debug/test-strcpy_chk.c: Import support/test-driver.c and also
<suppport/support.h> to use set_fortify_handler().
* string/bug-envz1.c: Import support/test-driver.c instead of
test-skeleton.c.
* string/bug-strcoll2.c: Likewise.
* string/bug-strtok1.c: Likewise.
* string/stratcliff.c: Likewise.
* string/test-ffs.c: Likewise.
* string/test-memccpy.c: Likewise.
* string/test-memchr.c: Likewise.
* string/test-memcmp.c: Likewise.
* string/test-memcpy.c: Likewise.
* string/test-memmem.c: Likewise.
* string/test-memmove.c: Likewise.
* string/test-memrchr.c: Likewise.
* string/test-memset.c: Likewise.
* string/test-rawmemchr.c: Likewise.
* string/test-strcasecmp.c: Likewise.
* string/test-strcasestr.c: Likewise.
* string/test-strcat.c: Likewise.
* string/test-strchr.c: Likewise.
* string/test-strcmp.c: Likewise.
* string/test-strcpy.c: Likewise.
* string/test-string.h: Likewise.
* string/test-strlen.c: Likewise.
* string/test-strncasecmp.c: Likewise.
* string/test-strncat.c: Likewise.
* string/test-strncmp.c: Likewise.
* string/test-strncpy.c: Likewise.
* string/test-strnlen.c: Likewise.
* string/test-strpbrk.c: Likewise.
* string/test-strrchr.c: Likewise.
* string/test-strspn.c: Likewise.
* string/test-strstr.c: Likewise.
* string/tst-bswap.c: Likewise.
* string/tst-cmp.c: Likewise.
* string/tst-endian.c: Likewise.
* string/tst-inlcall.c: Likewise.
* string/tst-strcoll-overflow.c: Likewise.
* string/tst-strfry.c: Likewise.
* string/tst-strlen.c: Likewise.
* string/tst-strtok.c: Likewise.
* string/tst-strtok_r.c: Likewise.
* string/tst-strxfrm.c: Likewise.
* string/tst-strxfrm2.c: Likewise.
* string/tst-svc.c: Likewise.
* string/tst-svc2.c: Likewise.
+2017-03-23 Wainer dos Santos Moschetta <wainersm@linux.vnet.ibm.com>
+
+ * string/test-string.h (TEST_FUNCTION): Use test_main instead of
+ test_main ().
+ (CMDLINE_PROCESS): Use function instead of defined macro.
+ * debug/test-strcpy_chk.c: Import support/test-driver.c and also
+ <suppport/support.h> to use set_fortify_handler().
+ * string/bug-envz1.c: Import support/test-driver.c instead of
+ test-skeleton.c.
+ * string/bug-strcoll2.c: Likewise.
+ * string/bug-strtok1.c: Likewise.
+ * string/stratcliff.c: Likewise.
+ * string/test-ffs.c: Likewise.
+ * string/test-memccpy.c: Likewise.
+ * string/test-memchr.c: Likewise.
+ * string/test-memcmp.c: Likewise.
+ * string/test-memcpy.c: Likewise.
+ * string/test-memmem.c: Likewise.
+ * string/test-memmove.c: Likewise.
+ * string/test-memrchr.c: Likewise.
+ * string/test-memset.c: Likewise.
+ * string/test-rawmemchr.c: Likewise.
+ * string/test-strcasecmp.c: Likewise.
+ * string/test-strcasestr.c: Likewise.
+ * string/test-strcat.c: Likewise.
+ * string/test-strchr.c: Likewise.
+ * string/test-strcmp.c: Likewise.
+ * string/test-strcpy.c: Likewise.
+ * string/test-string.h: Likewise.
+ * string/test-strlen.c: Likewise.
+ * string/test-strncasecmp.c: Likewise.
+ * string/test-strncat.c: Likewise.
+ * string/test-strncmp.c: Likewise.
+ * string/test-strncpy.c: Likewise.
+ * string/test-strnlen.c: Likewise.
+ * string/test-strpbrk.c: Likewise.
+ * string/test-strrchr.c: Likewise.
+ * string/test-strspn.c: Likewise.
+ * string/test-strstr.c: Likewise.
+ * string/tst-bswap.c: Likewise.
+ * string/tst-cmp.c: Likewise.
+ * string/tst-endian.c: Likewise.
+ * string/tst-inlcall.c: Likewise.
+ * string/tst-strcoll-overflow.c: Likewise.
+ * string/tst-strfry.c: Likewise.
+ * string/tst-strlen.c: Likewise.
+ * string/tst-strtok.c: Likewise.
+ * string/tst-strtok_r.c: Likewise.
+ * string/tst-strxfrm.c: Likewise.
+ * string/tst-strxfrm2.c: Likewise.
+ * string/tst-svc.c: Likewise.
+ * string/tst-svc2.c: Likewise.
+
2017-03-22 Zack Weinberg <zackw@panix.com>
* stdio-common/bug25.c: Include stdlib.h.
#include <signal.h>
static int test_main (void);
-#define TEST_FUNCTION test_main ()
-#include "../test-skeleton.c"
+#define TEST_FUNCTION test_main
+#include <support/test-driver.c>
+#include <support/support.h>
volatile int chk_fail_ok;
jmp_buf chk_fail_buf;
#define nstrs (sizeof (strs) / sizeof (strs[0]))
-static int
+int
do_test (void)
{
return result;
}
-#define TEST_FUNCTION do_test ()
-#include "../test-skeleton.c"
+#include <support/test-driver.c>
}
}
-static int
+int
do_test (void)
{
int err = 0;
return err;
}
-#define TEST_FUNCTION do_test ()
-#include "../test-skeleton.c"
+#include <support/test-driver.c>
#include <string.h>
#include <stdio.h>
-static int
+int
do_test (void)
{
const char str[] = "axaaba";
return result;
}
-#define TEST_FUNCTION do_test ()
-#include "../test-skeleton.c"
+#include <support/test-driver.c>
#define STRINGIFY2(s) #s
-static int
+int
do_test (void)
{
int size = sysconf (_SC_PAGESIZE);
return result;
}
-#define TEST_FUNCTION do_test ()
-#include "../test-skeleton.c"
+#include <support/test-driver.c>
#include <stdio.h>
#include <string.h>
-static int
+int
do_test (void)
{
int failures = 0;
return failures;
}
-#define TEST_FUNCTION do_test ()
-#include "../test-skeleton.c"
+#include <support/test-driver.c>
return ret;
}
-#include "../test-skeleton.c"
+#include <support/test-driver.c>
return ret;
}
-#include "../test-skeleton.c"
+#include <support/test-driver.c>
do_random_tests ();
return ret;
}
-#include "../test-skeleton.c"
+
+#include <support/test-driver.c>
return ret;
}
-#include "../test-skeleton.c"
+#include <support/test-driver.c>
return ret;
}
-#include "../test-skeleton.c"
+#include <support/test-driver.c>
return ret;
}
-#include "../test-skeleton.c"
+#include <support/test-driver.c>
return ret;
}
-#include "../test-skeleton.c"
+#include <support/test-driver.c>
return ret;
}
-#include "../test-skeleton.c"
+#include <support/test-driver.c>
return ret;
}
-#include "../test-skeleton.c"
+#include <support/test-driver.c>
return ret;
}
-#include "../test-skeleton.c"
+#include <support/test-driver.c>
return ret;
}
-#include "../test-skeleton.c"
+#include <support/test-driver.c>
return ret;
}
-#include "../test-skeleton.c"
+#include <support/test-driver.c>
return ret;
}
-#include "../test-skeleton.c"
+#include <support/test-driver.c>
return ret;
}
-#include "../test-skeleton.c"
+#include <support/test-driver.c>
return ret;
}
-#include "../test-skeleton.c"
+#include <support/test-driver.c>
#undef __USE_STRING_INLINES
+#include <getopt.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#define GLRO(x) _##x
-# define TEST_FUNCTION test_main ()
+# define TEST_FUNCTION test_main
# define TIMEOUT (4 * 60)
# define OPT_ITERATIONS 10000
# define OPT_RANDOM 10001
# define CMDLINE_OPTIONS ITERATIONS_OPTIONS \
{ "random", no_argument, NULL, OPT_RANDOM }, \
{ "seed", required_argument, NULL, OPT_SEED },
-# define CMDLINE_PROCESS ITERATIONS_PROCESS \
- case OPT_RANDOM: \
- { \
- int fdr = open ("/dev/urandom", O_RDONLY); \
- \
- if (fdr < 0 || read (fdr, &seed, sizeof(seed)) != sizeof (seed)) \
- seed = time (NULL); \
- if (fdr >= 0) \
- close (fdr); \
- do_srandom = 1; \
- break; \
- } \
- \
- case OPT_SEED: \
- seed = strtoul (optarg, NULL, 0); \
- do_srandom = 1; \
- break;
+
+static void __attribute__ ((used))
+cmdline_process_function (int c)
+{
+ switch (c)
+ {
+ ITERATIONS_PROCESS
+ case OPT_RANDOM:
+ {
+ int fdr = open ("/dev/urandom", O_RDONLY);
+ if (fdr < 0 || read (fdr, &seed, sizeof (seed)) != sizeof (seed))
+ seed = time (NULL);
+ if (fdr >= 0)
+ close (fdr);
+ do_srandom = 1;
+ break;
+ }
+
+ case OPT_SEED:
+ seed = strtoul (optarg, NULL, 0);
+ do_srandom = 1;
+ break;
+ }
+}
+# define CMDLINE_PROCESS cmdline_process_function
#define CALL(impl, ...) \
(* (proto_t) (impl)->fn) (__VA_ARGS__)
return ret;
}
-#include "../test-skeleton.c"
+#include <support/test-driver.c>
return ret;
}
-#include "../test-skeleton.c"
+#include <support/test-driver.c>
return ret;
}
-#include "../test-skeleton.c"
+#include <support/test-driver.c>
return ret;
}
-#include "../test-skeleton.c"
+#include <support/test-driver.c>
return ret;
}
-#include "../test-skeleton.c"
+#include <support/test-driver.c>
return ret;
}
-#include "../test-skeleton.c"
+#include <support/test-driver.c>
return ret;
}
-#include "../test-skeleton.c"
+#include <support/test-driver.c>
return ret;
}
-#include "../test-skeleton.c"
+#include <support/test-driver.c>
return ret;
}
-#include "../test-skeleton.c"
+#include <support/test-driver.c>
return ret;
}
-#include "../test-skeleton.c"
+#include <support/test-driver.c>
extern unsigned long long int wash (unsigned long long int a);
-static int
+int
do_test (void)
{
int result = 0;
return a + 0;
}
-#define TEST_FUNCTION do_test ()
-#include "../test-skeleton.c"
+#include <support/test-driver.c>
return strncasecmp (left, right, SIZE_MAX);
}
-static int
+int
do_test (void)
{
enum {
machines. */
#define TIMEOUT 300
-#define TEST_FUNCTION do_test ()
-#include "../test-skeleton.c"
+#include <support/test-driver.c>
# define DIAG_IGNORE_NEEDS_COMMENT_TAUTOLOGICAL_COMPARE()
#endif
-static int
+int
do_test (void)
{
int result = 0;
return result;
}
-#define TEST_FUNCTION do_test ()
-#include "../test-skeleton.c"
+#include <support/test-driver.c>
#include <fcntl.h>
-static int
+int
do_test (void)
{
int status;
return status;
}
-#define TEST_FUNCTION do_test ()
-#include "../test-skeleton.c"
+#include <support/test-driver.c>
64-bit. */
#define SIZE 0x40000000ul
-static int
+int
do_test (void)
{
TEST_VERIFY_EXIT (setlocale (LC_COLLATE, "en_GB.UTF-8") != NULL);
#include <stdio.h>
#include <string.h>
-static int
+int
do_test (void)
{
char str[] = "this is a test";
return 0;
}
-#define TEST_FUNCTION do_test ()
-#include "../test-skeleton.c"
+#include <support/test-driver.c>
#include <stdio.h>
#include <string.h>
-static int
+int
do_test (void)
{
static const size_t lens[] = { 0, 1, 0, 2, 0, 1, 0, 3,
return 0;
}
-#define TEST_FUNCTION do_test ()
-#include "../test-skeleton.c"
+#include <support/test-driver.c>
#include <stdio.h>
#include <string.h>
-static int
+int
do_test (void)
{
char buf[1] = { 0 };
return result;
}
-#define TEST_FUNCTION do_test ()
-#include "../test-skeleton.c"
+#include <support/test-driver.c>
return strcmp (tok, "udf") != 0;
}
-#include "../test-skeleton.c"
+#include <support/test-driver.c>
}
-static int
+int
do_test (void)
{
int result = 0;
return result;
}
-#define TEST_FUNCTION do_test ()
-#include "../test-skeleton.c"
+#include <support/test-driver.c>
#include <stdio.h>
#include <string.h>
-static int
+int
do_test (void)
{
static const char test_locale[] = "de_DE.UTF-8";
return res;
}
-#define TEST_FUNCTION do_test ()
-#include "../test-skeleton.c"
+#include <support/test-driver.c>
return strverscmp (*((char **) p1), *((char **) p2));
}
-static int
+int
do_test (void)
{
char line[MAX_LINE_SIZE + 1];
return EXIT_SUCCESS;
}
-#define TEST_FUNCTION do_test ()
-#include "../test-skeleton.c"
+#include <support/test-driver.c>
}
-static int
+int
do_test (void)
{
int res = 0;
return res;
}
-#define TEST_FUNCTION do_test ()
-#include "../test-skeleton.c"
+#include <support/test-driver.c>