summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--test/nptl/tst-cancel7.c7
-rw-r--r--test/nptl/tst-mqueue7.c5
-rw-r--r--test/test-skeleton.c10
3 files changed, 4 insertions, 18 deletions
diff --git a/test/nptl/tst-cancel7.c b/test/nptl/tst-cancel7.c
index fe543f73f..3bdfa9fa6 100644
--- a/test/nptl/tst-cancel7.c
+++ b/test/nptl/tst-cancel7.c
@@ -196,16 +196,13 @@ do_cleanup (void)
#define OPT_COMMAND 10000
#define OPT_PIDFILE 10001
#define CMDLINE_OPTIONS \
- "c:p:"
-/*
{ "command", required_argument, NULL, OPT_COMMAND }, \
{ "pidfile", required_argument, NULL, OPT_PIDFILE },
-*/
#define CMDLINE_PROCESS \
- case 'c': \
+ case OPT_COMMAND: \
command = optarg; \
break; \
- case 'p': \
+ case OPT_PIDFILE: \
pidfile = optarg; \
break;
// #define CLEANUP_HANDLER do_cleanup ()
diff --git a/test/nptl/tst-mqueue7.c b/test/nptl/tst-mqueue7.c
index 01d7cd7d6..d1a652903 100644
--- a/test/nptl/tst-mqueue7.c
+++ b/test/nptl/tst-mqueue7.c
@@ -32,12 +32,9 @@
static mqd_t after_exec = (mqd_t) -1;
#define CMDLINE_OPTIONS \
- "a:"
-/*
{ "after-exec", required_argument, NULL, OPT_AFTEREXEC },
-*/
#define CMDLINE_PROCESS \
- case 'a': \
+ case OPT_AFTEREXEC: \
after_exec = (mqd_t) strtoul (optarg, NULL, 0); \
break;
diff --git a/test/test-skeleton.c b/test/test-skeleton.c
index 69ef99f76..cf7afea03 100644
--- a/test/test-skeleton.c
+++ b/test/test-skeleton.c
@@ -18,6 +18,7 @@
<http://www.gnu.org/licenses/>. */
#include <errno.h>
+#include <getopt.h>
#include <malloc.h>
#include <search.h>
#include <signal.h>
@@ -45,7 +46,6 @@
#define OPT_DIRECT 1000
#define OPT_TESTDIR 1001
-#if 0 /* Not used in uClibc */
static struct option options[] =
{
#ifdef CMDLINE_OPTIONS
@@ -55,7 +55,6 @@ static struct option options[] =
{ "test-dir", required_argument, NULL, OPT_TESTDIR },
{ NULL, 0, NULL, 0 }
};
-#endif
/* PID of the test itself. */
static pid_t pid;
@@ -242,14 +241,7 @@ main (int argc, char *argv[])
setbuf (stdout, NULL);
#endif
-#if 0 /* Not used in uClibc */
while ((opt = getopt_long (argc, argv, "+", options, NULL)) != -1)
-#else
-# ifndef CMDLINE_OPTIONS
-# define CMDLINE_OPTIONS ""
-# endif
- while ((opt = getopt (argc, argv, "+" CMDLINE_OPTIONS)) >= 0)
-#endif
switch (opt)
{
case '?':