diff options
| -rw-r--r-- | testsuites/psxtests/ChangeLog | 7 | ||||
| -rw-r--r-- | testsuites/psxtests/psxmsgq01/init.c | 28 | ||||
| -rw-r--r-- | testsuites/psxtests/psxsem01/init.c | 19 |
3 files changed, 36 insertions, 18 deletions
diff --git a/testsuites/psxtests/ChangeLog b/testsuites/psxtests/ChangeLog index 4a272f0e2c..26b63ffbf2 100644 --- a/testsuites/psxtests/ChangeLog +++ b/testsuites/psxtests/ChangeLog @@ -1,5 +1,12 @@ 2011-10-25 Ralf Corsépius <ralf.corsepius@rtems.org> + * psxmsgq01/init.c: Introduce fatal_posix_mqd. + Replace fatal_posix_service_pointer_minus_one with fatal_posix_mqd. + * psxsem01/init.c: Introduce fatal_posix_sem. + Replace fatal_posix_service_pointer_minus_one with fatal_posix_sem. + +2011-10-25 Ralf Corsépius <ralf.corsepius@rtems.org> + * psxreaddir/test.c: Remove bogus casts. Fix fprintf format strings. diff --git a/testsuites/psxtests/psxmsgq01/init.c b/testsuites/psxtests/psxmsgq01/init.c index d77ddfbf52..8d083e2152 100644 --- a/testsuites/psxtests/psxmsgq01/init.c +++ b/testsuites/psxtests/psxmsgq01/init.c @@ -22,6 +22,16 @@ #include <signal.h> /* signal facilities */ #include "test_support.h" +#define fatal_posix_mqd( _ptr, _msg ) \ + if ( (_ptr != (mqd_t) -1) ) { \ + check_dispatch_disable_level( 0 ); \ + printf( "\n%s FAILED -- expected (-1) got (%" PRId32 " - %d/%s)\n", \ + (_msg), _ptr, errno, strerror(errno) ); \ + FLUSH_OUTPUT(); \ + rtems_test_exit( -1 ); \ + } + + typedef struct { char msg[ 50 ]; int size; @@ -174,8 +184,7 @@ void validate_mq_open_error_codes(void) attr.mq_maxmsg = -1; puts( "Init: mq_open - Create with maxmsg (-1) (EINVAL)" ); n_mq2 = mq_open( "mq2", O_CREAT | O_RDONLY, 0x777, &attr); - fatal_posix_service_pointer_minus_one( - (void *)n_mq2, "mq_open error return status" ); + fatal_posix_mqd( n_mq2, "mq_open error return status" ); fatal_posix_service_status( errno, EINVAL, "mq_open errno EINVAL"); attr.mq_maxmsg = MAXMSG; @@ -186,8 +195,7 @@ void validate_mq_open_error_codes(void) attr.mq_msgsize = -1; puts( "Init: mq_open - Create with msgsize (-1) (EINVAL)" ); n_mq2 = mq_open( "mq2", O_CREAT | O_RDONLY, 0x777, &attr); - fatal_posix_service_pointer_minus_one( - (void *) n_mq2, "mq_open error return status" ); + fatal_posix_mqd( n_mq2, "mq_open error return status" ); fatal_posix_service_status( errno, EINVAL, "mq_open errno EINVAL"); attr.mq_msgsize = MSGSIZE; @@ -197,8 +205,7 @@ void validate_mq_open_error_codes(void) puts( "Init: mq_open - Open new mq without create flag (ENOENT)" ); n_mq2 = mq_open( "mq3", O_EXCL | O_RDONLY, 0x777, NULL); - fatal_posix_service_pointer_minus_one( - (void *) n_mq2, "mq_open error return status" ); + fatal_posix_mqd( n_mq2, "mq_open error return status" ); fatal_posix_service_status( errno, ENOENT, "mq_open errno ENOENT"); /* @@ -211,8 +218,7 @@ void validate_mq_open_error_codes(void) puts( "Init: mq_open - Open with too long of a name (ENAMETOOLONG)" ); n_mq2 = mq_open( Get_Too_Long_Name(), O_CREAT | O_RDONLY, 0x777, NULL ); - fatal_posix_service_pointer_minus_one( - (void *) n_mq2, "mq_open error return status" ); + fatal_posix_mqd( n_mq2, "mq_open error return status" ); fatal_posix_service_status( errno, ENAMETOOLONG, "mq_open errno ENAMETOOLONG"); /* @@ -231,8 +237,7 @@ void validate_mq_open_error_codes(void) n_mq2 = mq_open( Build_Queue_Name(0), O_CREAT | O_EXCL | O_RDONLY, 0x777, NULL); - fatal_posix_service_pointer_minus_one( - (void *) n_mq2, "mq_open error return status" ); + fatal_posix_mqd( n_mq2, "mq_open error return status" ); fatal_posix_service_status( errno, EEXIST, "mq_open errno EEXIST"); status = mq_unlink( Build_Queue_Name(0) ); @@ -273,8 +278,7 @@ void validate_mq_open_error_codes(void) puts( "Init: mq_open - system is out of resources (ENFILE)" ); n_mq2 = mq_open( Build_Queue_Name(i), O_CREAT | O_RDONLY, 0x777, NULL ); - fatal_posix_service_pointer_minus_one( - (void *) n_mq2, "mq_open error return status" ); + fatal_posix_mqd( n_mq2, "mq_open error return status" ); fatal_posix_service_status( errno, ENFILE, "mq_open errno ENFILE"); /* diff --git a/testsuites/psxtests/psxsem01/init.c b/testsuites/psxtests/psxsem01/init.c index 47146a6e49..736471b57a 100644 --- a/testsuites/psxtests/psxsem01/init.c +++ b/testsuites/psxtests/psxsem01/init.c @@ -22,6 +22,16 @@ #include <pmacros.h> #include "test_support.h" +#define fatal_posix_sem( _ptr, _msg ) \ + if ( (_ptr != SEM_FAILED) ) { \ + check_dispatch_disable_level( 0 ); \ + printf( "\n%s FAILED -- expected (-1) got (%p - %d/%s)\n", \ + (_msg), _ptr, errno, strerror(errno) ); \ + FLUSH_OUTPUT(); \ + rtems_test_exit( -1 ); \ + } + + #define MAX_SEMS 10 void *POSIX_Init( @@ -175,8 +185,7 @@ void *POSIX_Init( puts( "Init: sem_open - UNSUCCESSFUL (ENAMETOOLONG)" ); n_sem1 = sem_open(Get_Too_Long_Name(), O_CREAT, 0777, 1 ); - fatal_posix_service_pointer_minus_one( - n_sem1, "sem_open error return status"); + fatal_posix_sem( n_sem1, "sem_open error return status" ); fatal_posix_service_status( errno, ENAMETOOLONG, "sem_open errorno ENAMETOOLONG" ); @@ -191,14 +200,12 @@ void *POSIX_Init( puts( "Init: sem_open - Create an Existing sem (EEXIST)" ); n_sem2 = sem_open("sem1", O_CREAT | O_EXCL, 0777, 1); - fatal_posix_service_pointer_minus_one( - n_sem2, "sem_open error return status" ); + fatal_posix_sem( n_sem2, "sem_open error return status" ); fatal_posix_service_status( errno, EEXIST, "sem_open errno EEXIST"); puts( "Init: sem_open - Open new sem without create flag (ENOENT)" ); n_sem2 = sem_open("sem3", O_EXCL, 0777, 1); - fatal_posix_service_pointer_minus_one( - n_sem2, "sem_open error return status" ); + fatal_posix_sem( n_sem2, "sem_open error return status" ); fatal_posix_service_status( errno, ENOENT, "sem_open errno EEXIST"); /* |