From c1f4108352e446285e99f046e3929ed13d5e9851 Mon Sep 17 00:00:00 2001 From: Arjun Shankar Date: Mon, 3 Aug 2015 16:14:21 +0000 Subject: Modify several tests to use test-skeleton.c These tests were skipped by the use-test-skeleton conversion done in commit 29955b5d because they did not have an `int main (void)' declaration. Instead their `main' functions were declared with arguments (i.e. argc, argv) even though they didn't use them. Remove these arguments and include the test skeleton in these tests. --- string/tst-strlen.c | 7 +++++-- string/tst-svc.c | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) (limited to 'string') diff --git a/string/tst-strlen.c b/string/tst-strlen.c index 8cbe441..8376831 100644 --- a/string/tst-strlen.c +++ b/string/tst-strlen.c @@ -5,8 +5,8 @@ #include #include -int -main(int argc, char *argv[]) +static int +do_test (void) { static const size_t lens[] = { 0, 1, 0, 2, 0, 1, 0, 3, 0, 1, 0, 2, 0, 1, 0, 4 }; @@ -53,3 +53,6 @@ strnlen failed for base=%Zu, words=%Zu, and last=%Zu (is %zd, expected %zd)\n", } return 0; } + +#define TEST_FUNCTION do_test () +#include "../test-skeleton.c" diff --git a/string/tst-svc.c b/string/tst-svc.c index 1ee5342..1b0da3e 100644 --- a/string/tst-svc.c +++ b/string/tst-svc.c @@ -13,8 +13,8 @@ compare (const void *p1, const void *p2) return strverscmp (*((char **) p1), *((char **) p2)); } -int -main (int argc, char *argv[]) +static int +do_test (void) { char line[MAX_LINE_SIZE + 1]; char *str[MAX_STRINGS]; @@ -43,3 +43,6 @@ main (int argc, char *argv[]) return EXIT_SUCCESS; } + +#define TEST_FUNCTION do_test () +#include "../test-skeleton.c" -- cgit v1.1