summaryrefslogtreecommitdiffstats
path: root/testsuites/psxtests/psxsignal03
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2009-09-14 00:15:55 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2009-09-14 00:15:55 +0000
commit1e2d7510363b4099315c9ec0dd541bf3c3764297 (patch)
tree30269ecd6127c9b7837b6bec5795aec9d1c22fa0 /testsuites/psxtests/psxsignal03
parent2009-09-13 Joel Sherrill <joel.sherrill@oarcorp.com> (diff)
downloadrtems-1e2d7510363b4099315c9ec0dd541bf3c3764297.tar.bz2
2009-09-13 Joel Sherrill <joel.sherrill@oarcorp.com>
* psxclock/init.c, psxclock/psxclock.scn, psxenosys/init.c, psxenosys/psxenosys.scn, psxsignal03/Makefile.am, psxsignal03/init.c, psxsignal04/Makefile.am: Move test cases which needed to be executed when POSIX is disabled to psxclock so they will be.
Diffstat (limited to 'testsuites/psxtests/psxsignal03')
-rw-r--r--testsuites/psxtests/psxsignal03/Makefile.am2
-rw-r--r--testsuites/psxtests/psxsignal03/init.c42
2 files changed, 33 insertions, 11 deletions
diff --git a/testsuites/psxtests/psxsignal03/Makefile.am b/testsuites/psxtests/psxsignal03/Makefile.am
index eb45b3dddf..3d3e01ea4c 100644
--- a/testsuites/psxtests/psxsignal03/Makefile.am
+++ b/testsuites/psxtests/psxsignal03/Makefile.am
@@ -18,7 +18,7 @@ psxsignal03_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
AM_CPPFLAGS += -I$(top_srcdir)/include
AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-AM_CPPFLAGS += -DUSE_USER_SIGNALS
+AM_CPPFLAGS += -DUSE_USER_SIGNALS_PROCESS
LINK_OBJS = $(psxsignal03_OBJECTS) $(psxsignal03_LDADD)
LINK_LIBS = $(psxsignal03_LDLIBS)
diff --git a/testsuites/psxtests/psxsignal03/init.c b/testsuites/psxtests/psxsignal03/init.c
index 18a8ff40e6..dd22f0a114 100644
--- a/testsuites/psxtests/psxsignal03/init.c
+++ b/testsuites/psxtests/psxsignal03/init.c
@@ -9,17 +9,37 @@
* $Id$
*/
-#if defined(USE_USER_SIGNALS)
+#if defined(USE_USER_SIGNALS_PROCESS)
#define TEST_NAME "03"
- #define TEST_STRING "User Signals"
+ #define TEST_STRING "User Signals to Process"
#define SIGNAL_ONE SIGUSR1
#define SIGNAL_TWO SIGUSR2
+ #define SEND_SIGNAL(_sig) kill( getpid(), _sig )
+ #define TO_PROCESS
-#elif defined(USE_REAL_TIME_SIGNALS)
+#elif defined(USE_REAL_TIME_SIGNALS_PROCESS)
#define TEST_NAME "04"
- #define TEST_STRING "Real-Time Signals"
+ #define TEST_STRING "Real-Time Signals to Process"
#define SIGNAL_ONE SIGRTMIN
#define SIGNAL_TWO SIGRTMAX
+ #define SEND_SIGNAL(_sig) kill( getpid(), _sig )
+ #define TO_PROCESS
+
+#elif defined(USE_USER_SIGNALS_THREAD)
+ #define TEST_NAME "05"
+ #define TEST_STRING "User Signals to Thread"
+ #define SIGNAL_ONE SIGUSR1
+ #define SIGNAL_TWO SIGUSR2
+ #define SEND_SIGNAL(_sig) pthread_kill( id, _sig )
+ #define TO_THREAD
+
+#elif defined(USE_REAL_TIME_SIGNALS_THREAD)
+ #define TEST_NAME "05"
+ #define TEST_STRING "Real-Time Signals to Thread"
+ #define SIGNAL_ONE SIGRTMIN
+ #define SIGNAL_TWO SIGRTMAX
+ #define SEND_SIGNAL(_sig) pthread_kill( id, _sig )
+ #define TO_THREAD
#else
#error "Test Mode not defined"
@@ -154,18 +174,20 @@ void *POSIX_Init(
printf( "Init - sending %s - deliver to one thread\n",
signal_name(SIGNAL_TWO));
- sc = kill( getpid(), SIGNAL_TWO );
+ sc = SEND_SIGNAL( SIGNAL_TWO );
assert( !sc );
printf( "Init - sending %s - deliver to other thread\n",
signal_name(SIGNAL_TWO));
- sc = kill( getpid(), SIGNAL_TWO );
+ sc = SEND_SIGNAL( SIGNAL_TWO );
assert( !sc );
- printf( "Init - sending %s - expect EAGAIN\n", signal_name(SIGNAL_TWO) );
- sc = kill( getpid(), SIGNAL_TWO );
- assert( sc == -1 );
- assert( errno == EAGAIN );
+ #if defined(TO_PROCESS)
+ printf( "Init - sending %s - expect EAGAIN\n", signal_name(SIGNAL_TWO) );
+ sc = SEND_SIGNAL( SIGNAL_TWO );
+ assert( sc == -1 );
+ assert( errno == EAGAIN );
+ #endif
puts( "Init - sleep - let thread report if it unblocked - OK" );
usleep(500000);