about summary refs log tree commit diff
path: root/string
diff options
context:
space:
mode:
authorArjun Shankar <arjun.is@lostca.se>2015-08-03 16:14:21 +0000
committerMike Frysinger <vapier@gentoo.org>2015-08-06 02:59:04 -0400
commitc1f4108352e446285e99f046e3929ed13d5e9851 (patch)
tree6f9e0d7e91314c36593a92f7a0f11cb14839e04f /string
parenta03ba3630548d74920884dd12442d9937ad47072 (diff)
downloadglibc-c1f4108352e446285e99f046e3929ed13d5e9851.tar.gz
glibc-c1f4108352e446285e99f046e3929ed13d5e9851.tar.xz
glibc-c1f4108352e446285e99f046e3929ed13d5e9851.zip
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.
Diffstat (limited to 'string')
-rw-r--r--string/tst-strlen.c7
-rw-r--r--string/tst-svc.c7
2 files changed, 10 insertions, 4 deletions
diff --git a/string/tst-strlen.c b/string/tst-strlen.c
index 8cbe441975..8376831de5 100644
--- a/string/tst-strlen.c
+++ b/string/tst-strlen.c
@@ -5,8 +5,8 @@
 #include <stdio.h>
 #include <string.h>
 
-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 1ee5342aa9..1b0da3efe5 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"