From e73106827198c0fc71dc7e62d01ee290c9b76484 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Fri, 25 Sep 2009 13:26:35 +0000 Subject: 2009-09-25 Joel Sherrill * sp14/asr.c, sp14/sp14.doc, sp14/task1.c, sp14/task2.c: Adjust test to run when IO speed varies. --- testsuites/sptests/ChangeLog | 5 ++++ testsuites/sptests/sp14/asr.c | 2 ++ testsuites/sptests/sp14/sp14.doc | 53 ++++++++++++++++++++++++---------------- testsuites/sptests/sp14/task1.c | 6 +++++ testsuites/sptests/sp14/task2.c | 7 ++++++ 5 files changed, 52 insertions(+), 21 deletions(-) (limited to 'testsuites') diff --git a/testsuites/sptests/ChangeLog b/testsuites/sptests/ChangeLog index d9aa24adc7..a60c1656a6 100644 --- a/testsuites/sptests/ChangeLog +++ b/testsuites/sptests/ChangeLog @@ -1,3 +1,8 @@ +2009-09-25 Joel Sherrill + + * sp14/asr.c, sp14/sp14.doc, sp14/task1.c, sp14/task2.c: Adjust test to + run when IO speed varies. + 2009-09-14 Joel Sherrill * sp43/init.c, sp43/sp43.scn: Minor correction to test case so it hits diff --git a/testsuites/sptests/sp14/asr.c b/testsuites/sptests/sp14/asr.c index 0ba4f0c4f7..10786aa3b4 100644 --- a/testsuites/sptests/sp14/asr.c +++ b/testsuites/sptests/sp14/asr.c @@ -35,6 +35,7 @@ rtems_asr Process_asr( case RTEMS_SIGNAL_0: case RTEMS_SIGNAL_1: puts( "ASR - rtems_task_wake_after - yield processor" ); + FLUSH_OUTPUT(); status = rtems_task_wake_after( RTEMS_YIELD_PROCESSOR ); directive_failed( status, "rtems_task_wake_after yield" ); break; @@ -43,4 +44,5 @@ rtems_asr Process_asr( break; } printf( "ASR - EXIT - signal => %08x\n", the_signal_set ); + FLUSH_OUTPUT(); } diff --git a/testsuites/sptests/sp14/sp14.doc b/testsuites/sptests/sp14/sp14.doc index fdc5e2c0f2..4e9274fdb7 100644 --- a/testsuites/sptests/sp14/sp14.doc +++ b/testsuites/sptests/sp14/sp14.doc @@ -1,23 +1,34 @@ -# -# $Id$ -# -# COPYRIGHT (c) 1989-1999. -# On-Line Applications Research Corporation (OAR). -# -# The license and distribution terms for this file may be -# found in the file LICENSE in this distribution or at -# http://www.rtems.com/license/LICENSE. -# +Could not open '/dev/kqemu' - QEMU acceleration layer not activated: No such file or directory -This file describes the directives and concepts tested by this test set. - -test set name: test14 - -directives: - ex_init, ex_start, t_create, t_start, t_delete, tm_tick, i_return, - as_catch, as_return, as_send, tm_wkafter - -concepts: - - a. This test checks out the signal manager. +*** TEST 14 *** +TA1 - rtems_signal_catch - RTEMS_INTERRUPT_LEVEL( 3 ) +TA1 - rtems_signal_send - RTEMS_SIGNAL_16 to self +ASR - ENTRY - signal => 00010000 +ASR - EXIT - signal => 00010000 +TA1 - rtems_signal_send - RTEMS_SIGNAL_0 to self +ASR - ENTRY - signal => 00000001 +ASR - rtems_task_wake_after - yield processor +ASR - EXIT - signal => 00000001 +TA1 - rtems_signal_catch - RTEMS_NO_ASR + +TA1 - rtems_signal_send - RTEMS_SIGNAL_1 to self +ASR - ENTRY - signal => 00000002 +ASR - rtems_task_wake_after - yield processor +ASR - EXIT - signal => 00000002 +TA1 - rtems_task_mode - disable ASRs +TA1 - sending signal to RTEMS_SELF from timer +TA1 - waiting for signal to arrive +TA1 - timer routine got the correct arguments +TA1 - rtems_task_mode - enable ASRs +ASR - ENTRY - signal => 00000008 +ASR - EXIT - signal => 00000008 +TA2 - rtems_signal_send - RTEMS_SIGNAL_17 to TA1 +TA2 - rtems_task_wake_after - yield processor +TA2 - rtems_signal_send - RTEMS_SIGNAL_18 and RTEMS_SIGNAL_19 to TA1 +TA2 - rtems_task_wake_after - yield processor +ASR - ENTRY - signal => 000e0000 +ASR - EXIT - signal => 000e0000 +TA1 - rtems_signal_catch - asraddr of NULL +TA1 - rtems_task_delete - delete self +*** END OF TEST 14 *** diff --git a/testsuites/sptests/sp14/task1.c b/testsuites/sptests/sp14/task1.c index 5196b34e77..898a1afce8 100644 --- a/testsuites/sptests/sp14/task1.c +++ b/testsuites/sptests/sp14/task1.c @@ -59,6 +59,8 @@ rtems_task Task_1( status = rtems_signal_catch( Process_asr, RTEMS_NO_ASR ); directive_failed( status, "rtems_signal_catch" ); + FLUSH_OUTPUT(); + rtems_test_pause(); puts( "TA1 - rtems_signal_send - RTEMS_SIGNAL_1 to self" ); @@ -102,9 +104,13 @@ rtems_test_pause(); ); puts( "TA1 - rtems_task_mode - enable ASRs" ); + FLUSH_OUTPUT(); status = rtems_task_mode( RTEMS_ASR, RTEMS_ASR_MASK, &previous_mode ); directive_failed( status, "rtems_task_mode" ); + status = rtems_task_wake_after(2 * rtems_clock_get_ticks_per_second()); + directive_failed( status, "rtems_task_wake_after" ); + puts( "TA1 - rtems_signal_catch - asraddr of NULL" ); status = rtems_signal_catch( NULL, RTEMS_DEFAULT_MODES ); directive_failed( status, "rtems_signal_catch" ); diff --git a/testsuites/sptests/sp14/task2.c b/testsuites/sptests/sp14/task2.c index 6c44de4f62..7e7afae9d1 100644 --- a/testsuites/sptests/sp14/task2.c +++ b/testsuites/sptests/sp14/task2.c @@ -26,6 +26,9 @@ rtems_task Task_2( { rtems_status_code status; + status = rtems_task_wake_after(rtems_clock_get_ticks_per_second()); + directive_failed( status, "rtems_task_wake_after" ); + puts( "TA2 - rtems_signal_send - RTEMS_SIGNAL_17 to TA1" ); status = rtems_signal_send( Task_id[ 1 ], RTEMS_SIGNAL_17 ); directive_failed( status, "rtems_signal_send" ); @@ -39,9 +42,13 @@ rtems_task Task_2( directive_failed( status, "rtems_signal_send" ); puts( "TA2 - rtems_task_wake_after - yield processor" ); + FLUSH_OUTPUT(); status = rtems_task_wake_after( RTEMS_YIELD_PROCESSOR ); directive_failed( status, "rtems_task_wake_after" ); + status = rtems_task_wake_after(2 * rtems_clock_get_ticks_per_second()); + directive_failed( status, "rtems_task_wake_after" ); + puts( "*** END OF TEST 14 ***" ); rtems_test_exit( 0 ); } -- cgit v1.2.3