test: Adjust passed options

to follow suit 067637375658047d70c296606ae17ef0bc86499d

Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>

diff --git a/test/nptl/Makefile.in b/test/nptl/Makefile.in
index dd53f91..42a4654 100644 (file)
--- 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 fe543f7..bb9f739 100644 (file)
--- 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 b5d290f..1a4b88c 100644 (file)
--- 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 01d7cd7..12c6d9a 100644 (file)
--- a/test/nptl/tst-mqueue7.c
+++ b/test/nptl/tst-mqueue7.c
@@ -90,14 +90,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;