summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2015-01-26 11:22:42 -0600
committerWaldemar Brodkorb <wbx@openadk.org>2015-01-26 11:22:42 -0600
commitf03fbbb009c0df52d363719a592e2ac33577d9a6 (patch)
tree01671bcc5099ef304faf5ae86d58bbf32f9d0b7c /test
parent97dc8cb71d96a4bbfda0aa51740433d5da825b6a (diff)
parent92de8a5f6ffb1ff9f7183fd08d872aa098b75ae2 (diff)
merge upstream changes
Diffstat (limited to 'test')
-rw-r--r--test/nptl/Makefile.in2
-rw-r--r--test/nptl/tst-cancel7.c2
-rw-r--r--test/nptl/tst-exec4.c2
-rw-r--r--test/nptl/tst-mqueue7.c6
4 files changed, 6 insertions, 6 deletions
diff --git a/test/nptl/Makefile.in b/test/nptl/Makefile.in
index d20d2c1a5..700a464cf 100644
--- a/test/nptl/Makefile.in
+++ b/test/nptl/Makefile.in
@@ -207,7 +207,7 @@ tst-tls5: tst-tls5mod.so
tst-cleanupx4 : tst-cleanup4aux.o
tst-fini1: tst-fini1mod.so
-OPTS_tst-cancel7 = --command ./tst-cancel7
+OPTS_tst-cancel7 = -c ./tst-cancel7
OPTS_tst-mqueue7 = -- ./tst-mqueue7
OPTS_tst-exec4 = ./tst-exec4
diff --git a/test/nptl/tst-cancel7.c b/test/nptl/tst-cancel7.c
index 3bdfa9fa6..616c0a8ce 100644
--- a/test/nptl/tst-cancel7.c
+++ b/test/nptl/tst-cancel7.c
@@ -32,7 +32,7 @@ char pidfilename[] = "/tmp/tst-cancel7-XXXXXX";
static void *
tf (void *arg)
{
- const char *args = " --direct --pidfile ";
+ const char *args = " -d -p ";
char *cmd = alloca (strlen (command) + strlen (args)
+ strlen (pidfilename) + 1);
diff --git a/test/nptl/tst-exec4.c b/test/nptl/tst-exec4.c
index b5d290f77..1a4b88c69 100644
--- a/test/nptl/tst-exec4.c
+++ b/test/nptl/tst-exec4.c
@@ -51,7 +51,7 @@ tf (void *arg)
char **argv = (char **) alloca ((n + 1) * sizeof (char *));
for (n = 0; oldargv[n + 1] != NULL; ++n)
argv[n] = oldargv[n + 1];
- argv[n++] = (char *) "--direct";
+ argv[n++] = (char *) "-d";
argv[n] = NULL;
execv (argv[0], argv);
diff --git a/test/nptl/tst-mqueue7.c b/test/nptl/tst-mqueue7.c
index d1a652903..d3ea2b7c8 100644
--- a/test/nptl/tst-mqueue7.c
+++ b/test/nptl/tst-mqueue7.c
@@ -87,14 +87,14 @@ do_test (int argc, char **argv)
return 1;
}
- char after_exec_arg[sizeof "--after-exec=0x" + sizeof (long) * 3];
+ char after_exec_arg[sizeof "-a=0x" + sizeof (long) * 3];
snprintf (after_exec_arg, sizeof (after_exec_arg),
- "--after-exec=0x%lx", (long) q);
+ "-a=0x%lx", (long) q);
const char *newargv[argc + 2];
for (int i = 1; i < argc; ++i)
newargv[i - 1] = argv[i];
- newargv[argc - 1] = "--direct";
+ newargv[argc - 1] = "-d";
newargv[argc] = after_exec_arg;
newargv[argc + 1] = NULL;