diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2008-09-05 14:41:37 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2008-09-05 14:41:37 +0000 |
| commit | a319ebef08dc16f0371459a0a709f792d7d498b2 (patch) | |
| tree | 7de6c8e49ad5bac0f592e9665faaf8ca00738b9d /testsuites/mptests | |
| parent | 2008-09-05 Eric Norum <norume@aps.anl.gov> (diff) | |
| download | rtems-a319ebef08dc16f0371459a0a709f792d7d498b2.tar.bz2 | |
2008-09-05 Joel Sherrill <joel.sherrill@oarcorp.com>
* mp03/delay.c, mp06/task1.c, mp06/node2/mp06-node2.scn, mp07/task1.c:
Updating and fixing while running them on psim.
Diffstat (limited to 'testsuites/mptests')
| -rw-r--r-- | testsuites/mptests/ChangeLog | 5 | ||||
| -rw-r--r-- | testsuites/mptests/mp03/delay.c | 3 | ||||
| -rw-r--r-- | testsuites/mptests/mp06/node2/mp06-node2.scn | 2 | ||||
| -rw-r--r-- | testsuites/mptests/mp06/task1.c | 5 | ||||
| -rw-r--r-- | testsuites/mptests/mp07/task1.c | 9 |
5 files changed, 20 insertions, 4 deletions
diff --git a/testsuites/mptests/ChangeLog b/testsuites/mptests/ChangeLog index efffd4dbbf..b9e8cbec93 100644 --- a/testsuites/mptests/ChangeLog +++ b/testsuites/mptests/ChangeLog @@ -1,3 +1,8 @@ +2008-09-05 Joel Sherrill <joel.sherrill@oarcorp.com> + + * mp03/delay.c, mp06/task1.c, mp06/node2/mp06-node2.scn, mp07/task1.c: + Updating and fixing while running them on psim. + 2008-09-03 Joel Sherrill <joel.sherrill@OARcorp.com> * mp05/system.h, mp05/task1.c, mp06/system.h, mp06/task1.c, diff --git a/testsuites/mptests/mp03/delay.c b/testsuites/mptests/mp03/delay.c index 9a86ddb923..8829faa7af 100644 --- a/testsuites/mptests/mp03/delay.c +++ b/testsuites/mptests/mp03/delay.c @@ -26,5 +26,6 @@ rtems_timer_service_routine Delayed_send_event( rtems_status_code status; status = rtems_event_send( Task_id[ 1 ], RTEMS_EVENT_16 ); - directive_failed_with_level( status, "rtems_event_send", 1 ); + if ( status ) printk( "Delayed_send_event failed %d\n", status ); + // directive_failed_with_level( status, "rtems_event_send", 1 ); } diff --git a/testsuites/mptests/mp06/node2/mp06-node2.scn b/testsuites/mptests/mp06/node2/mp06-node2.scn index 9cb653c2f3..618ce5b8ee 100644 --- a/testsuites/mptests/mp06/node2/mp06-node2.scn +++ b/testsuites/mptests/mp06/node2/mp06-node2.scn @@ -7,6 +7,8 @@ Getting TID of remote task Receiving events from remote task .................................................... .................................................... +Flushing RTEMS_EVENT_16 +Waiting for RTEMS_EVENT_16 rtems_event_receive - correctly returned RTEMS_TIMEOUT *** END OF TEST 6 *** diff --git a/testsuites/mptests/mp06/task1.c b/testsuites/mptests/mp06/task1.c index 83500c0e73..fd3331bed9 100644 --- a/testsuites/mptests/mp06/task1.c +++ b/testsuites/mptests/mp06/task1.c @@ -161,6 +161,11 @@ rtems_task Test_task( putchar( '\n' ); if ( Multiprocessing_configuration.node == 2 ) { + /* Flush events */ + puts( "Flushing RTEMS_EVENT_16" ); + (void) rtems_event_receive(RTEMS_EVENT_16, RTEMS_NO_WAIT, 0, &event_out); + + puts( "Waiting for RTEMS_EVENT_16" ); status = rtems_event_receive( RTEMS_EVENT_16, RTEMS_DEFAULT_OPTIONS, diff --git a/testsuites/mptests/mp07/task1.c b/testsuites/mptests/mp07/task1.c index 6df4d80792..bc7697051b 100644 --- a/testsuites/mptests/mp07/task1.c +++ b/testsuites/mptests/mp07/task1.c @@ -70,16 +70,17 @@ rtems_task Test_task( ); directive_failed( status, "rtems_timer_fire_after" ); - while ( Stop_Test == false ) { + while ( true ) { for ( count=DOT_COUNT ; count && (Stop_Test == false) ; count-- ) { status = rtems_event_receive( RTEMS_EVENT_16, RTEMS_DEFAULT_OPTIONS, - RTEMS_NO_TIMEOUT, + TICKS_PER_SECOND, &event_out ); if ( status == RTEMS_TIMEOUT ) { - puts( "\nTA1 - RTEMS_TIMEOUT .. probably OK if the other node exits" ); + printf("\nTA1 - RTEMS_TIMEOUT .. probably OK if the other node exits"); + Stop_Test = true; break; } else directive_failed( status, "rtems_event_receive" ); @@ -87,6 +88,8 @@ rtems_task Test_task( status = rtems_event_send( remote_tid, RTEMS_EVENT_16 ); directive_failed( status, "rtems_event_send" ); } + if ( Stop_Test ) + break; put_dot('.'); } |