diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2015-02-12 14:03:55 -0600 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2015-02-12 14:03:55 -0600 |
| commit | c725f1deaef5bbfb22c83fbfc221a86255a3072b (patch) | |
| tree | 903e5de62bccd2d0e4464f620921b6ab1191e1ff /test/nptl/tst-cancel7.c | |
| parent | ee1800ca1a614fabbeb20ebb6b8c90cc3eaf243b (diff) | |
| parent | cfdddb3c53213ab6af35364b683de2bf8e8ab05a (diff) | |
resolve merge conflict
Diffstat (limited to 'test/nptl/tst-cancel7.c')
| -rw-r--r-- | test/nptl/tst-cancel7.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/test/nptl/tst-cancel7.c b/test/nptl/tst-cancel7.c index 616c0a8ce..9e7d22ed5 100644 --- a/test/nptl/tst-cancel7.c +++ b/test/nptl/tst-cancel7.c @@ -193,19 +193,15 @@ do_cleanup (void) } #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 |