From 2d29741ab6c13af31c01a4c88a6e70e6763809ec Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Mon, 8 Sep 2008 13:26:34 +0000 Subject: 2008-09-08 Joel Sherrill * sp34/sp34.scn, sp35/sp35.scn: Convert to UNIX CR/LF style. --- testsuites/sptests/ChangeLog | 4 ++ testsuites/sptests/sp34/sp34.scn | 50 ++++++++--------- testsuites/sptests/sp35/sp35.scn | 116 +++++++++++++++++++-------------------- 3 files changed, 87 insertions(+), 83 deletions(-) (limited to 'testsuites') diff --git a/testsuites/sptests/ChangeLog b/testsuites/sptests/ChangeLog index dfbc4f2ad1..8b12bbd602 100644 --- a/testsuites/sptests/ChangeLog +++ b/testsuites/sptests/ChangeLog @@ -1,3 +1,7 @@ +2008-09-08 Joel Sherrill + + * sp34/sp34.scn, sp35/sp35.scn: Convert to UNIX CR/LF style. + 2008-09-06 Ralf Corsépius * sp35/priinv.c, sp37/init.c, sp38/init.c, sp39/init.c, sp41/init.c, diff --git a/testsuites/sptests/sp34/sp34.scn b/testsuites/sptests/sp34/sp34.scn index 770d5788ce..dc47e2bf54 100644 --- a/testsuites/sptests/sp34/sp34.scn +++ b/testsuites/sptests/sp34/sp34.scn @@ -1,26 +1,26 @@ Exception handling initialization done - - -*** TEST 34 *** -Blockers[0] Id = 0x0a010002 -Blockers[1] Id = 0x0a010003 -Blockers[2] Id = 0x0a010004 -Blockers[3] Id = 0x0a010005 -Blockers[4] Id = 0x0a010006 -semaphore_obtain -- BlockingTask 0 @ pri=2) blocks -semaphore_obtain -- BlockingTask 1 @ pri=3) blocks -semaphore_obtain -- BlockingTask 2 @ pri=4) blocks -semaphore_obtain -- BlockingTask 3 @ pri=5) blocks -semaphore_obtain -- BlockingTask 4 @ pri=6) blocks -rtems_task_set_priority -- invert priorities of tasks -rtems_semaphore_release -- OK -semaphore_obtain -- BlockingTask 4 @ pri=2) returns -rtems_semaphore_release -- OK -semaphore_obtain -- BlockingTask 3 @ pri=3) returns -rtems_semaphore_release -- OK -semaphore_obtain -- BlockingTask 2 @ pri=4) returns -rtems_semaphore_release -- OK -semaphore_obtain -- BlockingTask 1 @ pri=5) returns -rtems_semaphore_release -- OK -semaphore_obtain -- BlockingTask 0 @ pri=6) returns -*** END OF TEST 34 *** + + +*** TEST 34 *** +Blockers[0] Id = 0x0a010002 +Blockers[1] Id = 0x0a010003 +Blockers[2] Id = 0x0a010004 +Blockers[3] Id = 0x0a010005 +Blockers[4] Id = 0x0a010006 +semaphore_obtain -- BlockingTask 0 @ pri=2) blocks +semaphore_obtain -- BlockingTask 1 @ pri=3) blocks +semaphore_obtain -- BlockingTask 2 @ pri=4) blocks +semaphore_obtain -- BlockingTask 3 @ pri=5) blocks +semaphore_obtain -- BlockingTask 4 @ pri=6) blocks +rtems_task_set_priority -- invert priorities of tasks +rtems_semaphore_release -- OK +semaphore_obtain -- BlockingTask 4 @ pri=2) returns +rtems_semaphore_release -- OK +semaphore_obtain -- BlockingTask 3 @ pri=3) returns +rtems_semaphore_release -- OK +semaphore_obtain -- BlockingTask 2 @ pri=4) returns +rtems_semaphore_release -- OK +semaphore_obtain -- BlockingTask 1 @ pri=5) returns +rtems_semaphore_release -- OK +semaphore_obtain -- BlockingTask 0 @ pri=6) returns +*** END OF TEST 34 *** diff --git a/testsuites/sptests/sp35/sp35.scn b/testsuites/sptests/sp35/sp35.scn index c07f87cee6..a1b4f8c32c 100644 --- a/testsuites/sptests/sp35/sp35.scn +++ b/testsuites/sptests/sp35/sp35.scn @@ -1,59 +1,59 @@ Exception handling initialization done - - -*** TEST 35 *** -Sync Mutex Id = 0x1a010009 -Local Mutex Id = 0x1a01000a -Remote Mutex Id = 0x1a01000b -Ending Init-task -TaMedium[0] Id = 0x0a010002 -TaMedium[1] Id = 0x0a010003 -TaMedium[2] Id = 0x0a010004 -TaHigh Id = 0x0a010005 -TaLow Id = 0x0a010006 -TaHwSim Id = 0x0a010007 -High_Exec (0) begins... -Medium_Exec (0) begins... -Medium_Exec (1) begins... -Medium_Exec (2) begins... -Low_Exec (0) begins... -LocalHwSim_Exec begins... - AccessLocalHw called by MED0 -- 100 - AccessLocalHw called by MED2 -- 100 - AccessLocalHw called by MED1 -- 100 -AccessRemoteHw called by LOW -- 200 -AccessRemoteHw access local LOW -- 200 - AccessLocalHw called by LOW -- 200 - AccessLocalHw returns to MED0 -- 100 - AccessLocalHw called by MED0 -- 100 -AccessRemoteHw called by HIGH -- 10 - AccessLocalHw returns to MED2 -- 100 - AccessLocalHw called by MED2 -- 100 - AccessLocalHw returns to LOW -- 10 -AccessRemoteHw access local HIGH -- 10 - AccessLocalHw called by HIGH -- 10 -AccessRemoteHw returns to LOW -- 200 -AccessRemoteHw called by LOW -- 200 - AccessLocalHw returns to MED1 -- 100 - AccessLocalHw called by MED1 -- 100 - AccessLocalHw returns to HIGH -- 10 -AccessRemoteHw returns to HIGH -- 10 -AccessRemoteHw called by HIGH -- 10 -AccessRemoteHw access local LOW -- 10 - AccessLocalHw called by LOW -- 10 - AccessLocalHw returns to MED0 -- 100 - AccessLocalHw called by MED0 -- 100 - AccessLocalHw returns to LOW -- 10 -AccessRemoteHw access local HIGH -- 10 - AccessLocalHw called by HIGH -- 10 -AccessRemoteHw returns to LOW -- 200 -AccessRemoteHw called by LOW -- 200 - AccessLocalHw returns to MED2 -- 100 - AccessLocalHw called by MED2 -- 100 - AccessLocalHw returns to HIGH -- 10 -AccessRemoteHw returns to HIGH -- 10 -AccessRemoteHw called by HIGH -- 10 -AccessRemoteHw access local LOW -- 10 - AccessLocalHw called by LOW -- 10 - AccessLocalHw returns to MED1 -- 100 -*** END OF TEST 35 *** + + +*** TEST 35 *** +Sync Mutex Id = 0x1a010009 +Local Mutex Id = 0x1a01000a +Remote Mutex Id = 0x1a01000b +Ending Init-task +TaMedium[0] Id = 0x0a010002 +TaMedium[1] Id = 0x0a010003 +TaMedium[2] Id = 0x0a010004 +TaHigh Id = 0x0a010005 +TaLow Id = 0x0a010006 +TaHwSim Id = 0x0a010007 +High_Exec (0) begins... +Medium_Exec (0) begins... +Medium_Exec (1) begins... +Medium_Exec (2) begins... +Low_Exec (0) begins... +LocalHwSim_Exec begins... + AccessLocalHw called by MED0 -- 100 + AccessLocalHw called by MED2 -- 100 + AccessLocalHw called by MED1 -- 100 +AccessRemoteHw called by LOW -- 200 +AccessRemoteHw access local LOW -- 200 + AccessLocalHw called by LOW -- 200 + AccessLocalHw returns to MED0 -- 100 + AccessLocalHw called by MED0 -- 100 +AccessRemoteHw called by HIGH -- 10 + AccessLocalHw returns to MED2 -- 100 + AccessLocalHw called by MED2 -- 100 + AccessLocalHw returns to LOW -- 10 +AccessRemoteHw access local HIGH -- 10 + AccessLocalHw called by HIGH -- 10 +AccessRemoteHw returns to LOW -- 200 +AccessRemoteHw called by LOW -- 200 + AccessLocalHw returns to MED1 -- 100 + AccessLocalHw called by MED1 -- 100 + AccessLocalHw returns to HIGH -- 10 +AccessRemoteHw returns to HIGH -- 10 +AccessRemoteHw called by HIGH -- 10 +AccessRemoteHw access local LOW -- 10 + AccessLocalHw called by LOW -- 10 + AccessLocalHw returns to MED0 -- 100 + AccessLocalHw called by MED0 -- 100 + AccessLocalHw returns to LOW -- 10 +AccessRemoteHw access local HIGH -- 10 + AccessLocalHw called by HIGH -- 10 +AccessRemoteHw returns to LOW -- 200 +AccessRemoteHw called by LOW -- 200 + AccessLocalHw returns to MED2 -- 100 + AccessLocalHw called by MED2 -- 100 + AccessLocalHw returns to HIGH -- 10 +AccessRemoteHw returns to HIGH -- 10 +AccessRemoteHw called by HIGH -- 10 +AccessRemoteHw access local LOW -- 10 + AccessLocalHw called by LOW -- 10 + AccessLocalHw returns to MED1 -- 100 +*** END OF TEST 35 *** -- cgit v1.2.3