MAJOR_VERSION := 1
MINOR_VERSION := 0
SUBLEVEL := 0
-EXTRAVERSION :=
+EXTRAVERSION :=-git
VERSION := $(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL)
ABI_VERSION := $(MAJOR_VERSION)
ifneq ($(EXTRAVERSION),)
}
#endif
-#define OPT_COMMAND 10000
-#define OPT_PIDFILE 10001
#define CMDLINE_OPTIONS \
- { "command", required_argument, NULL, OPT_COMMAND }, \
- { "pidfile", required_argument, NULL, OPT_PIDFILE },
+ "c:p:"
#define CMDLINE_PROCESS \
- case OPT_COMMAND: \
+ case 'c': \
command = optarg; \
break; \
- case OPT_PIDFILE: \
+ case 'p': \
pidfile = optarg; \
break;
-// #define CLEANUP_HANDLER do_cleanup ()
#define PREPARE(argc, argv) do_prepare (argc, argv)
#define TEST_FUNCTION do_test ()
#define TIMEOUT 5
static mqd_t after_exec = (mqd_t) -1;
#define CMDLINE_OPTIONS \
- { "after-exec", required_argument, NULL, OPT_AFTEREXEC },
+ "a:"
+
#define CMDLINE_PROCESS \
- case OPT_AFTEREXEC: \
+ case 'a': \
after_exec = (mqd_t) strtoul (optarg, NULL, 0); \
break;
# 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;
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