Update.
* test-skeleton.c (main): Request getopt to not reorder the command line.
This commit is contained in:
Ulrich Drepper
parent
80b5421740
commit
6f1acb30c1
|
|
@ -1,5 +1,8 @@
|
|||
2003-06-01 Ulrich Drepper <drepper@redhat.com>
|
||||
|
||||
* test-skeleton.c (main): Request getopt to not reorder the
|
||||
command line.
|
||||
|
||||
* elf/Makefile (CFLAGS-dl-runtime.c): Define.
|
||||
|
||||
* wcsmbs/wcpncpy.c (__wcpncpy): Fix broken implementation to match
|
||||
|
|
|
|||
|
|
@ -1,3 +1,9 @@
|
|||
2003-06-01 Ulrich Drepper <drepper@redhat.com>
|
||||
|
||||
* Makefile (tests): Add tst-exec4.
|
||||
(tst-exec4-ARGS): Define.
|
||||
* tst-exec4.c: New file.
|
||||
|
||||
2003-05-31 Ulrich Drepper <drepper@redhat.com>
|
||||
|
||||
* sysdeps/unix/sysv/linux/lowlevellock.c (__lll_timedlock_wait):
|
||||
|
|
|
|||
|
|
@ -169,7 +169,7 @@ tests = tst-attr1 tst-attr2 \
|
|||
tst-flock1 tst-flock2 \
|
||||
tst-signal1 tst-signal2 tst-signal3 tst-signal4 tst-signal5 \
|
||||
tst-signal6 \
|
||||
tst-exec1 tst-exec2 tst-exec3 \
|
||||
tst-exec1 tst-exec2 tst-exec3 tst-exec4 \
|
||||
tst-exit1 \
|
||||
tst-stdio1 tst-stdio2 \
|
||||
tst-stack1 \
|
||||
|
|
@ -408,3 +408,5 @@ $(objpfx)tst-cancel-wrappers.out: tst-cancel-wrappers.sh
|
|||
$(objpfx)libpthread.a > $@
|
||||
endif
|
||||
endif
|
||||
|
||||
tst-exec4-ARGS = $(built-program-cmd)
|
||||
|
|
|
|||
|
|
@ -0,0 +1,116 @@
|
|||
/* Signal handler and mask set in thread which calls exec.
|
||||
Copyright (C) 2003 Free Software Foundation, Inc.
|
||||
This file is part of the GNU C Library.
|
||||
Contributed by Ulrich Drepper <drepper@redhat.com>, 2003.
|
||||
|
||||
The GNU C Library is free software; you can redistribute it and/or
|
||||
modify it under the terms of the GNU Lesser General Public
|
||||
License as published by the Free Software Foundation; either
|
||||
version 2.1 of the License, or (at your option) any later version.
|
||||
|
||||
The GNU C Library is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
Lesser General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU Lesser General Public
|
||||
License along with the GNU C Library; if not, write to the Free
|
||||
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
||||
02111-1307 USA. */
|
||||
|
||||
#include <pthread.h>
|
||||
#include <signal.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <unistd.h>
|
||||
|
||||
|
||||
static void *
|
||||
tf (void *arg)
|
||||
{
|
||||
/* Ignore SIGUSR1 and block SIGUSR2. */
|
||||
if (sigignore (SIGUSR1) != 0)
|
||||
{
|
||||
puts ("sigignore failed");
|
||||
exit (1);
|
||||
}
|
||||
|
||||
sigset_t ss;
|
||||
sigemptyset (&ss);
|
||||
sigaddset (&ss, SIGUSR2);
|
||||
if (pthread_sigmask (SIG_BLOCK, &ss, NULL) != 0)
|
||||
{
|
||||
puts ("1st run: sigmask failed");
|
||||
exit (1);
|
||||
}
|
||||
|
||||
char **oldargv = (char **) arg;
|
||||
size_t n = 1;
|
||||
while (oldargv[n] != NULL)
|
||||
++n;
|
||||
|
||||
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] = NULL;
|
||||
|
||||
execv (argv[0], argv);
|
||||
|
||||
puts ("execv failed");
|
||||
|
||||
exit (1);
|
||||
}
|
||||
|
||||
|
||||
static int
|
||||
do_test (int argc, char *argv[])
|
||||
{
|
||||
if (argc == 1)
|
||||
{
|
||||
/* This is the second call. Perform the test. */
|
||||
struct sigaction sa;
|
||||
|
||||
if (sigaction (SIGUSR1, NULL, &sa) != 0)
|
||||
{
|
||||
puts ("2nd run: sigaction failed");
|
||||
return 1;
|
||||
}
|
||||
if (sa.sa_handler != SIG_IGN)
|
||||
{
|
||||
puts ("SIGUSR1 not ignored");
|
||||
return 1;
|
||||
}
|
||||
|
||||
sigset_t ss;
|
||||
if (pthread_sigmask (SIG_SETMASK, NULL, &ss) != 0)
|
||||
{
|
||||
puts ("2nd run: sigmask failed");
|
||||
return 1;
|
||||
}
|
||||
if (! sigismember (&ss, SIGUSR2))
|
||||
{
|
||||
puts ("SIGUSR2 not blocked");
|
||||
return 1;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
pthread_t th;
|
||||
if (pthread_create (&th, NULL, tf, argv) != 0)
|
||||
{
|
||||
puts ("create failed");
|
||||
exit (1);
|
||||
}
|
||||
|
||||
/* This call should never return. */
|
||||
pthread_join (th, NULL);
|
||||
|
||||
puts ("join returned");
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
#define TEST_FUNCTION do_test (argc, argv)
|
||||
#include "../test-skeleton.c"
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
/* Skeleton for test programs.
|
||||
Copyright (C) 1998, 2000, 2001, 2002 Free Software Foundation, Inc.
|
||||
Copyright (C) 1998, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
|
||||
This file is part of the GNU C Library.
|
||||
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
|
||||
|
||||
|
|
@ -184,7 +184,7 @@ main (int argc, char *argv[])
|
|||
setbuf (stdout, NULL);
|
||||
#endif
|
||||
|
||||
while ((opt = getopt_long (argc, argv, "", options, NULL)) != -1)
|
||||
while ((opt = getopt_long (argc, argv, "+", options, NULL)) != -1)
|
||||
switch (opt)
|
||||
{
|
||||
case '?':
|
||||
|
|
|
|||
Loading…
Reference in New Issue