summaryrefslogtreecommitdiff
path: root/test/test-skeleton.c
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2015-02-12 14:03:55 -0600
committerWaldemar Brodkorb <wbx@openadk.org>2015-02-12 14:03:55 -0600
commitc725f1deaef5bbfb22c83fbfc221a86255a3072b (patch)
tree903e5de62bccd2d0e4464f620921b6ab1191e1ff /test/test-skeleton.c
parentee1800ca1a614fabbeb20ebb6b8c90cc3eaf243b (diff)
parentcfdddb3c53213ab6af35364b683de2bf8e8ab05a (diff)
resolve merge conflict
Diffstat (limited to 'test/test-skeleton.c')
-rw-r--r--test/test-skeleton.c22
1 files changed, 6 insertions, 16 deletions
diff --git a/test/test-skeleton.c b/test/test-skeleton.c
index cf7afea03..03c2ff883 100644
--- a/test/test-skeleton.c
+++ b/test/test-skeleton.c
@@ -43,19 +43,6 @@
# define TEST_DATA_LIMIT (64 << 20) /* Data limit (bytes) to run with. */
#endif
-#define OPT_DIRECT 1000
-#define OPT_TESTDIR 1001
-
-static struct option options[] =
-{
-#ifdef CMDLINE_OPTIONS
- CMDLINE_OPTIONS
-#endif
- { "direct", no_argument, NULL, OPT_DIRECT },
- { "test-dir", required_argument, NULL, OPT_TESTDIR },
- { NULL, 0, NULL, 0 }
-};
-
/* PID of the test itself. */
static pid_t pid;
@@ -241,15 +228,18 @@ main (int argc, char *argv[])
setbuf (stdout, NULL);
#endif
- while ((opt = getopt_long (argc, argv, "+", options, NULL)) != -1)
+# ifndef CMDLINE_OPTIONS
+# define CMDLINE_OPTIONS ""
+# endif
+ while ((opt = getopt (argc, argv, "+dt:" CMDLINE_OPTIONS)) >= 0)
switch (opt)
{
case '?':
exit (1);
- case OPT_DIRECT:
+ case 'd':
direct = 1;
break;
- case OPT_TESTDIR:
+ case 't':
test_dir = optarg;
break;
#ifdef CMDLINE_PROCESS