12 Feb
2015
12 Feb
'15
7:59 p.m.
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "uClibc-ng - small C library for embedded systems".
The branch, master has been updated
via c725f1deaef5bbfb22c83fbfc221a86255a3072b (commit)
via cfdddb3c53213ab6af35364b683de2bf8e8ab05a (commit)
from ee1800ca1a614fabbeb20ebb6b8c90cc3eaf243b (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit c725f1deaef5bbfb22c83fbfc221a86255a3072b
Merge: ee1800c cfdddb3
Author: Waldemar Brodkorb <wbx(a)openadk.org>
Date: Thu Feb 12 14:03:55 2015 -0600
resolve merge conflict
-----------------------------------------------------------------------
Summary of changes:
Rules.mak | 2 +-
test/nptl/tst-cancel7.c | 10 +++-------
test/nptl/tst-mqueue7.c | 5 +++--
test/test-skeleton.c | 22 ++++++----------------
4 files changed, 13 insertions(+), 26 deletions(-)
diff --git a/Rules.mak b/Rules.mak
index 8889d19..2a73d7f 100644
--- a/Rules.mak
+++ b/Rules.mak
@@ -127,7 +127,7 @@ export RUNTIME_PREFIX DEVEL_PREFIX KERNEL_HEADERS MULTILIB_DIR
MAJOR_VERSION := 1
MINOR_VERSION := 0
SUBLEVEL := 0
-EXTRAVERSION := -git
+EXTRAVERSION :=-git
VERSION := $(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL)
ABI_VERSION := $(MAJOR_VERSION)
ifneq ($(EXTRAVERSION),)
diff --git a/test/nptl/tst-cancel7.c b/test/nptl/tst-cancel7.c
index 616c0a8..9e7d22e 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
diff --git a/test/nptl/tst-mqueue7.c b/test/nptl/tst-mqueue7.c
index d3ea2b7..1892f95 100644
--- a/test/nptl/tst-mqueue7.c
+++ b/test/nptl/tst-mqueue7.c
@@ -32,9 +32,10 @@
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;
diff --git a/test/test-skeleton.c b/test/test-skeleton.c
index cf7afea..03c2ff8 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
hooks/post-receive
--
uClibc-ng - small C library for embedded systems