summaryrefslogtreecommitdiff
path: root/misc
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 /misc
parenta03ba3630548d74920884dd12442d9937ad47072 (diff)
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 'misc')
-rw-r--r--misc/tst-mntent.c7
-rw-r--r--misc/tst-tsearch.c7
2 files changed, 10 insertions, 4 deletions
diff --git a/misc/tst-mntent.c b/misc/tst-mntent.c
index 876c89f8ed..932fd3f522 100644
--- a/misc/tst-mntent.c
+++ b/misc/tst-mntent.c
@@ -5,8 +5,8 @@
#include <string.h>
-int
-main (int argc, char *argv[])
+static int
+do_test (void)
{
int result = 0;
struct mntent mef;
@@ -97,3 +97,6 @@ main (int argc, char *argv[])
return result;
}
+
+#define TEST_FUNCTION do_test ()
+#include "../test-skeleton.c"
diff --git a/misc/tst-tsearch.c b/misc/tst-tsearch.c
index 70b6c339fc..dca22820c3 100644
--- a/misc/tst-tsearch.c
+++ b/misc/tst-tsearch.c
@@ -248,8 +248,8 @@ mangle_tree (enum order how, enum action what, void **root, int lag)
}
-int
-main (int argc, char **argv)
+static int
+do_test (void)
{
int total_error = 0;
static char state[8] = { 1, 2, 3, 4, 5, 6, 7, 8 };
@@ -350,3 +350,6 @@ main (int argc, char **argv)
return total_error;
}
+
+#define TEST_FUNCTION do_test ()
+#include "../test-skeleton.c"