From: <ro...@us...> - 2003-09-25 15:44:25
|
Update of /cvsroot/ltp/ltp/testcases/kernel/syscalls/sighold In directory sc8-pr-cvs1:/tmp/cvs-serv2930/sighold Modified Files: Makefile sighold02.c Log Message: Recoded how we handle NPTL installed systems. We now ignore signals 32 and 33 regardless of whether or not the system supports NPTL or Linuxthreads. Index: Makefile =================================================================== RCS file: /cvsroot/ltp/ltp/testcases/kernel/syscalls/sighold/Makefile,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- Makefile 3 Jun 2003 21:05:57 -0000 1.9 +++ Makefile 25 Sep 2003 15:44:20 -0000 1.10 @@ -20,13 +20,7 @@ # name of file : Makefile # ########################################################################### -NPTL:=$(shell getconf GNU_LIBPTHREAD_VERSION 2>/dev/null| grep NPTL; echo $?) -ifeq ($(NPTL),) -export CFLAGS+= -I../../../../include -D_GNU_SOURCE -else -export CFLAGS+= -I../../../../include -D_GNU_SOURCE -DUSE_NPTL -endif - +CFLAGS+= -I../../../../include -D_GNU_SOURCE LOADLIBES+= -L../../../../lib -lltp SRCS=$(wildcard *.c) Index: sighold02.c =================================================================== RCS file: /cvsroot/ltp/ltp/testcases/kernel/syscalls/sighold/sighold02.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- sighold02.c 29 Apr 2003 16:44:42 -0000 1.3 +++ sighold02.c 25 Sep 2003 15:44:20 -0000 1.4 @@ -87,10 +87,9 @@ #include "test.h" #include "usctest.h" -#ifdef USE_NPTL +/* Needed for NPTL */ #define SIGCANCEL 32 #define SIGTIMER 33 -#endif #ifdef _CRAYT3E #define CRAYT3E 1 @@ -248,10 +247,8 @@ } if ((sig != SIGCLD) && (sig != SIGKILL) && (sig != SIGALRM) && (sig != SIGSTOP) -#ifdef USE_NPTL && (sig != SIGCANCEL) && (sig != SIGTIMER) -#endif #ifdef SIGRECOVERY && (sig != SIGRECOVERY) #endif @@ -337,9 +334,7 @@ #ifdef SIGNOBDM && (sig != SIGNOBDM ) #endif -#ifdef USE_NPTL && (sig != SIGCANCEL) && (sig != SIGTIMER) -#endif ) { cnt++; @@ -553,9 +548,7 @@ #ifdef SIGSWAP && (sig != SIGSWAP) #endif -#ifdef USE_NPTL && (sig != SIGCANCEL) && (sig != SIGTIMER) -#endif ) { if (signal(sig, handle_sigs) == SIG_ERR) { |