From 012bb569b36bea365d3dd65db27360d70d5ae43f Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Thu, 3 Dec 1998 21:57:50 +0000 Subject: Insure that the same output occurs when multiprocessing is disabled. --- c/src/tests/sptests/sp09/screen01.c | 12 ++++++++++++ c/src/tests/sptests/sp09/screen03.c | 7 +++++++ c/src/tests/sptests/sp09/screen05.c | 7 +++++++ c/src/tests/sptests/sp09/screen07.c | 9 ++++++++- c/src/tests/sptests/sp09/screen11.c | 7 +++++++ testsuites/sptests/sp09/screen01.c | 12 ++++++++++++ testsuites/sptests/sp09/screen03.c | 7 +++++++ testsuites/sptests/sp09/screen05.c | 7 +++++++ testsuites/sptests/sp09/screen07.c | 9 ++++++++- testsuites/sptests/sp09/screen11.c | 7 +++++++ 10 files changed, 82 insertions(+), 2 deletions(-) diff --git a/c/src/tests/sptests/sp09/screen01.c b/c/src/tests/sptests/sp09/screen01.c index e3d0359837..ba1d257f51 100644 --- a/c/src/tests/sptests/sp09/screen01.c +++ b/c/src/tests/sptests/sp09/screen01.c @@ -74,12 +74,24 @@ void Screen1() ); puts( "TA1 - rtems_task_ident - local RTEMS_INVALID_NAME" ); + /* + * This one case is different if MP is enabled/disabled. + */ + status = rtems_task_ident( 100, 2, &Junk_id ); +#if defined(RTEMS_MULTIPROCESSING) fatal_directive_status( status, RTEMS_INVALID_NODE, "rtems_task_ident with illegal node" ); +#else + fatal_directive_status( + status, + RTEMS_INVALID_NAME, + "rtems_task_ident with illegal node" + ); +#endif puts( "TA1 - rtems_task_ident - RTEMS_INVALID_NODE" ); status = rtems_task_restart( 100, 0 ); diff --git a/c/src/tests/sptests/sp09/screen03.c b/c/src/tests/sptests/sp09/screen03.c index 713375cb52..fb99c5c16f 100644 --- a/c/src/tests/sptests/sp09/screen03.c +++ b/c/src/tests/sptests/sp09/screen03.c @@ -200,6 +200,12 @@ void Screen3() ); puts( "TA1 - rtems_task_create - 11 - RTEMS_TOO_MANY" ); + /* + * The check for an object being global is only made if + * multiprocessing is enabled. + */ + +#if defined(RTEMS_MULTIPROCESSING) status = rtems_task_create( task_name, 4, @@ -213,5 +219,6 @@ void Screen3() RTEMS_MP_NOT_CONFIGURED, "rtems_task_create of global task in a single cpu system" ); +#endif puts( "TA1 - rtems_task_create - RTEMS_MP_NOT_CONFIGURED" ); } diff --git a/c/src/tests/sptests/sp09/screen05.c b/c/src/tests/sptests/sp09/screen05.c index c5dfd1a067..646a28ba6d 100644 --- a/c/src/tests/sptests/sp09/screen05.c +++ b/c/src/tests/sptests/sp09/screen05.c @@ -116,6 +116,12 @@ void Screen5() ); puts( "TA1 - rtems_semaphore_create - RTEMS_INVALID_NUMBER" ); + /* + * The check for an object being global is only made if + * multiprocessing is enabled. + */ + +#if defined(RTEMS_MULTIPROCESSING) status = rtems_semaphore_create( Semaphore_name[ 3 ], 1, @@ -128,6 +134,7 @@ void Screen5() RTEMS_MP_NOT_CONFIGURED, "rtems_semaphore_create of mp not configured" ); +#endif puts( "TA1 - rtems_semaphore_create - RTEMS_MP_NOT_CONFIGURED" ); status = rtems_semaphore_delete( 100 ); diff --git a/c/src/tests/sptests/sp09/screen07.c b/c/src/tests/sptests/sp09/screen07.c index 14ba4ff2d2..5d55c94b9d 100644 --- a/c/src/tests/sptests/sp09/screen07.c +++ b/c/src/tests/sptests/sp09/screen07.c @@ -46,8 +46,14 @@ void Screen7() RTEMS_INVALID_NAME, "rtems_message_queue_create with illegal name" ); - puts( "TA1 - rtems_message_queue_create - Q 1 - RTEMS_INVALID_NAME" ); + + /* + * The check for an object being global is only made if + * multiprocessing is enabled. + */ + +#if defined(RTEMS_MULTIPROCESSING) status = rtems_message_queue_create( Queue_name[ 1 ], 1, @@ -60,6 +66,7 @@ void Screen7() RTEMS_MP_NOT_CONFIGURED, "rtems_message_queue_create of mp not configured" ); +#endif puts( "TA1 - rtems_message_queue_create - Q 1 - RTEMS_MP_NOT_CONFIGURED" ); status = rtems_message_queue_create( diff --git a/c/src/tests/sptests/sp09/screen11.c b/c/src/tests/sptests/sp09/screen11.c index 7857a98c95..8148aabb4d 100644 --- a/c/src/tests/sptests/sp09/screen11.c +++ b/c/src/tests/sptests/sp09/screen11.c @@ -88,6 +88,12 @@ void Screen11() "TA1 - rtems_partition_create - length < buffer size - RTEMS_INVALID_SIZE" ); + /* + * The check for an object being global is only made if + * multiprocessing is enabled. + */ + +#if defined(RTEMS_MULTIPROCESSING) status = rtems_partition_create( Partition_name[ 1 ], Partition_good_area, @@ -101,6 +107,7 @@ void Screen11() RTEMS_MP_NOT_CONFIGURED, "rtems_partition_create of global" ); +#endif puts( "TA1 - rtems_partition_create - RTEMS_MP_NOT_CONFIGURED" ); status = rtems_partition_create( diff --git a/testsuites/sptests/sp09/screen01.c b/testsuites/sptests/sp09/screen01.c index e3d0359837..ba1d257f51 100644 --- a/testsuites/sptests/sp09/screen01.c +++ b/testsuites/sptests/sp09/screen01.c @@ -74,12 +74,24 @@ void Screen1() ); puts( "TA1 - rtems_task_ident - local RTEMS_INVALID_NAME" ); + /* + * This one case is different if MP is enabled/disabled. + */ + status = rtems_task_ident( 100, 2, &Junk_id ); +#if defined(RTEMS_MULTIPROCESSING) fatal_directive_status( status, RTEMS_INVALID_NODE, "rtems_task_ident with illegal node" ); +#else + fatal_directive_status( + status, + RTEMS_INVALID_NAME, + "rtems_task_ident with illegal node" + ); +#endif puts( "TA1 - rtems_task_ident - RTEMS_INVALID_NODE" ); status = rtems_task_restart( 100, 0 ); diff --git a/testsuites/sptests/sp09/screen03.c b/testsuites/sptests/sp09/screen03.c index 713375cb52..fb99c5c16f 100644 --- a/testsuites/sptests/sp09/screen03.c +++ b/testsuites/sptests/sp09/screen03.c @@ -200,6 +200,12 @@ void Screen3() ); puts( "TA1 - rtems_task_create - 11 - RTEMS_TOO_MANY" ); + /* + * The check for an object being global is only made if + * multiprocessing is enabled. + */ + +#if defined(RTEMS_MULTIPROCESSING) status = rtems_task_create( task_name, 4, @@ -213,5 +219,6 @@ void Screen3() RTEMS_MP_NOT_CONFIGURED, "rtems_task_create of global task in a single cpu system" ); +#endif puts( "TA1 - rtems_task_create - RTEMS_MP_NOT_CONFIGURED" ); } diff --git a/testsuites/sptests/sp09/screen05.c b/testsuites/sptests/sp09/screen05.c index c5dfd1a067..646a28ba6d 100644 --- a/testsuites/sptests/sp09/screen05.c +++ b/testsuites/sptests/sp09/screen05.c @@ -116,6 +116,12 @@ void Screen5() ); puts( "TA1 - rtems_semaphore_create - RTEMS_INVALID_NUMBER" ); + /* + * The check for an object being global is only made if + * multiprocessing is enabled. + */ + +#if defined(RTEMS_MULTIPROCESSING) status = rtems_semaphore_create( Semaphore_name[ 3 ], 1, @@ -128,6 +134,7 @@ void Screen5() RTEMS_MP_NOT_CONFIGURED, "rtems_semaphore_create of mp not configured" ); +#endif puts( "TA1 - rtems_semaphore_create - RTEMS_MP_NOT_CONFIGURED" ); status = rtems_semaphore_delete( 100 ); diff --git a/testsuites/sptests/sp09/screen07.c b/testsuites/sptests/sp09/screen07.c index 14ba4ff2d2..5d55c94b9d 100644 --- a/testsuites/sptests/sp09/screen07.c +++ b/testsuites/sptests/sp09/screen07.c @@ -46,8 +46,14 @@ void Screen7() RTEMS_INVALID_NAME, "rtems_message_queue_create with illegal name" ); - puts( "TA1 - rtems_message_queue_create - Q 1 - RTEMS_INVALID_NAME" ); + + /* + * The check for an object being global is only made if + * multiprocessing is enabled. + */ + +#if defined(RTEMS_MULTIPROCESSING) status = rtems_message_queue_create( Queue_name[ 1 ], 1, @@ -60,6 +66,7 @@ void Screen7() RTEMS_MP_NOT_CONFIGURED, "rtems_message_queue_create of mp not configured" ); +#endif puts( "TA1 - rtems_message_queue_create - Q 1 - RTEMS_MP_NOT_CONFIGURED" ); status = rtems_message_queue_create( diff --git a/testsuites/sptests/sp09/screen11.c b/testsuites/sptests/sp09/screen11.c index 7857a98c95..8148aabb4d 100644 --- a/testsuites/sptests/sp09/screen11.c +++ b/testsuites/sptests/sp09/screen11.c @@ -88,6 +88,12 @@ void Screen11() "TA1 - rtems_partition_create - length < buffer size - RTEMS_INVALID_SIZE" ); + /* + * The check for an object being global is only made if + * multiprocessing is enabled. + */ + +#if defined(RTEMS_MULTIPROCESSING) status = rtems_partition_create( Partition_name[ 1 ], Partition_good_area, @@ -101,6 +107,7 @@ void Screen11() RTEMS_MP_NOT_CONFIGURED, "rtems_partition_create of global" ); +#endif puts( "TA1 - rtems_partition_create - RTEMS_MP_NOT_CONFIGURED" ); status = rtems_partition_create( -- cgit v1.2.3