From d1f92810507b8749791a15ec17592a5c4b79dcfa Mon Sep 17 00:00:00 2001 From: Jennifer Averett Date: Tue, 27 May 2014 09:39:09 -0500 Subject: schedsim_priority: Change scenario's to expect verbose output. --- .../schedsim_priority/scenarios/script01.expected | 12 +++++++++++ .../schedsim_priority/scenarios/script02.expected | 10 ++++++++++ .../schedsim_priority/scenarios/script03.expected | 22 +++++++++++++-------- .../schedsim_priority/scenarios/script04.expected | 11 +++++++++++ .../schedsim_priority/scenarios/script05.expected | 23 ++++++++++++++++++++++ .../schedsim_priority/scenarios/script06.expected | 15 ++++++++++++++ 6 files changed, 85 insertions(+), 8 deletions(-) diff --git a/schedsim/shell/schedsim_priority/scenarios/script01.expected b/schedsim/shell/schedsim_priority/scenarios/script01.expected index 23338de..508b5c0 100644 --- a/schedsim/shell/schedsim_priority/scenarios/script01.expected +++ b/schedsim/shell/schedsim_priority/scenarios/script01.expected @@ -1,22 +1,34 @@ +Script File : script01.scen +verbose : 1 +==> 1: echo "*** TEST 01 ***" *** TEST 01 *** +==> 2: rtems_init CPU 0: Thread Heir: 0x09010001 priority=255 CPU 0: Thread Executing: 0x09010001 priority=255 +==> 3: echo "=== Create and delete 0x0a010001 ===" === Create and delete 0x0a010001 === +==> 4: task_create TA1 3 Creating task with: Preemption: yes Timeslicing: no Task (TA1) created: id=0x0a010001, priority=3 Task (TA1) starting: id=0x0a010001, priority=3 CPU 0: Thread Heir: 0x0a010001 priority=3 CPU 0: Thread Executing: 0x0a010001 priority=3 +==> 5: task_delete TA1 CPU 0: Thread Heir: 0x09010001 priority=255 CPU 0: Thread Executing: 0x09010001 priority=255 Task (0x0a010001) deleted +==> 6: echo "=== Create and delete 0x0a010002 ===" === Create and delete 0x0a010002 === +==> 7: task_create TA1 3 Creating task with: Preemption: yes Timeslicing: no Task (TA1) created: id=0x0a010002, priority=3 Task (TA1) starting: id=0x0a010002, priority=3 CPU 0: Thread Heir: 0x0a010002 priority=3 CPU 0: Thread Executing: 0x0a010002 priority=3 +==> 8: task_delete 0x0a010002 CPU 0: Thread Heir: 0x09010001 priority=255 CPU 0: Thread Executing: 0x09010001 priority=255 Task (0x0a010002) deleted +==> 9: echo "*** END OF TEST 01 ***" *** END OF TEST 01 *** +==> 10: exit diff --git a/schedsim/shell/schedsim_priority/scenarios/script02.expected b/schedsim/shell/schedsim_priority/scenarios/script02.expected index 4f0c14e..bc8b355 100644 --- a/schedsim/shell/schedsim_priority/scenarios/script02.expected +++ b/schedsim/shell/schedsim_priority/scenarios/script02.expected @@ -1,15 +1,23 @@ +Script File : script02.scen +verbose : 1 +==> 1: echo "*** TEST 02 ***" *** TEST 02 *** +==> 2: rtems_init CPU 0: Thread Heir: 0x09010001 priority=255 CPU 0: Thread Executing: 0x09010001 priority=255 +==> 3: echo "=== Create 0x0a010001 ===" === Create 0x0a010001 === +==> 4: task_create TA1 1 Creating task with: Preemption: yes Timeslicing: no Task (TA1) created: id=0x0a010001, priority=1 Task (TA1) starting: id=0x0a010001, priority=1 CPU 0: Thread Heir: 0x0a010001 priority=1 CPU 0: Thread Executing: 0x0a010001 priority=1 +==> 5: task_wake_after 5 Task (0x0a010001) sleeping for 5 ticks CPU 0: Thread Heir: 0x09010001 priority=255 CPU 0: Thread Executing: 0x09010001 priority=255 +==> 6: clock_tick 7 ClockTick (1) ... ClockTick (2) ... ClockTick (3) ... @@ -19,4 +27,6 @@ ClockTick (5) ... CPU 0: Thread Executing: 0x0a010001 priority=1 ClockTick (6) ... ClockTick (7) ... +==> 7: echo "*** END OF TEST 2 ***" *** END OF TEST 2 *** +==> 8: exit diff --git a/schedsim/shell/schedsim_priority/scenarios/script03.expected b/schedsim/shell/schedsim_priority/scenarios/script03.expected index 4ccc8e8..fc5ad7f 100644 --- a/schedsim/shell/schedsim_priority/scenarios/script03.expected +++ b/schedsim/shell/schedsim_priority/scenarios/script03.expected @@ -1,26 +1,32 @@ +Script File : script03.scen +verbose : 1 +==> 1: echo "*** TEST 03 ***" *** TEST 03 *** +==> 2: rtems_init CPU 0: Thread Heir: 0x09010001 priority=255 CPU 0: Thread Executing: 0x09010001 priority=255 +==> 3: echo "=== Create 0x0a010001 ===" === Create 0x0a010001 === +==> 4: task_create TA1 1 Creating task with: Preemption: yes Timeslicing: no Task (TA1) created: id=0x0a010001, priority=1 Task (TA1) starting: id=0x0a010001, priority=1 CPU 0: Thread Heir: 0x0a010001 priority=1 CPU 0: Thread Executing: 0x0a010001 priority=1 +==> 5: echo "** Mode - query" ** Mode - query +==> 6: task_mode Previous Mode: Preemption: yes Timeslicing: no +==> 7: echo "** Mode - set no timeslicing" ** Mode - set no timeslicing +==> 8: task_mode -t Previous Mode: Preemption: yes Timeslicing: no Current Mode: Preemption: yes Timeslicing: no +==> 9: echo "** Mode - set timeslicing" ** Mode - set timeslicing +==> 10: task_mode -T Previous Mode: Preemption: yes Timeslicing: no Current Mode: Preemption: yes Timeslicing: yes +==> 11: echo "** Mode - set no timeslicing and no preempt" ** Mode - set no timeslicing and no preempt -Previous Mode: Preemption: yes Timeslicing: yes -Current Mode: Preemption: no Timeslicing: no -** Mode - set timeslicing and preempt -Previous Mode: Preemption: no Timeslicing: no -Current Mode: Preemption: yes Timeslicing: yes -** Mode - query -Previous Mode: Preemption: yes Timeslicing: yes -*** END OF TEST 03 *** +==> 12: task_mode -t -p diff --git a/schedsim/shell/schedsim_priority/scenarios/script04.expected b/schedsim/shell/schedsim_priority/scenarios/script04.expected index 9a82470..c6baa32 100644 --- a/schedsim/shell/schedsim_priority/scenarios/script04.expected +++ b/schedsim/shell/schedsim_priority/scenarios/script04.expected @@ -1,21 +1,32 @@ +Script File : script04.scen +verbose : 1 +==> 1: echo "*** TEST 04 ***" *** TEST 04 *** +==> 2: rtems_init CPU 0: Thread Heir: 0x09010001 priority=255 CPU 0: Thread Executing: 0x09010001 priority=255 +==> 3: echo Create 0x0a010001 Create 0x0a010001 +==> 4: task_create TA1 1 Creating task with: Preemption: yes Timeslicing: no Task (TA1) created: id=0x0a010001, priority=1 Task (TA1) starting: id=0x0a010001, priority=1 CPU 0: Thread Heir: 0x0a010001 priority=1 CPU 0: Thread Executing: 0x0a010001 priority=1 +==> 5: task_suspend TA1 Suspending task (0x0a010001) CPU 0: Thread Heir: 0x09010001 priority=255 CPU 0: Thread Executing: 0x09010001 priority=255 +==> 6: task_create TA1 2 Creating task with: Preemption: yes Timeslicing: no Task (TA1) created: id=0x0a010002, priority=2 Task (TA1) starting: id=0x0a010002, priority=2 CPU 0: Thread Heir: 0x0a010002 priority=2 CPU 0: Thread Executing: 0x0a010002 priority=2 +==> 7: task_resume TA1 Resuming task (0x0a010001) CPU 0: Thread Heir: 0x0a010001 priority=1 CPU 0: Thread Executing: 0x0a010001 priority=1 +==> 8: echo "*** END OF TEST 04 ***" *** END OF TEST 04 *** +==> 9: exit diff --git a/schedsim/shell/schedsim_priority/scenarios/script05.expected b/schedsim/shell/schedsim_priority/scenarios/script05.expected index da4bfdb..684355d 100644 --- a/schedsim/shell/schedsim_priority/scenarios/script05.expected +++ b/schedsim/shell/schedsim_priority/scenarios/script05.expected @@ -1,45 +1,68 @@ +Script File : script05.scen +verbose : 1 +==> 1: echo "*** TEST 05 ***" *** TEST 05 *** +==> 2: rtems_init CPU 0: Thread Heir: 0x09010001 priority=255 CPU 0: Thread Executing: 0x09010001 priority=255 +==> 3: echo Create 0x0a010001 Create 0x0a010001 +==> 4: task_create TA1 1 Creating task with: Preemption: yes Timeslicing: no Task (TA1) created: id=0x0a010001, priority=1 Task (TA1) starting: id=0x0a010001, priority=1 CPU 0: Thread Heir: 0x0a010001 priority=1 CPU 0: Thread Executing: 0x0a010001 priority=1 +==> 5: task_create TA2 2 Creating task with: Preemption: yes Timeslicing: no Task (TA2) created: id=0x0a010002, priority=2 Task (TA2) starting: id=0x0a010002, priority=2 +==> 6: task_create TA3 3 Creating task with: Preemption: yes Timeslicing: no Task (TA3) created: id=0x0a010003, priority=3 Task (TA3) starting: id=0x0a010003, priority=3 +==> 7: semaphore_create SEM1 Semaphore (SEM1) created: id=0x1a010001 +==> 8: semaphore_obtain SEM1 0 Obtain semaphore (0x1a010001) with timeout 0 CPU 0: Thread Heir: 0x0a010002 priority=2 CPU 0: Thread Executing: 0x0a010002 priority=2 +==> 9: semaphore_obtain SEM1 0 Obtain semaphore (0x1a010001) with timeout 0 CPU 0: Thread Heir: 0x0a010003 priority=3 CPU 0: Thread Executing: 0x0a010003 priority=3 +==> 10: semaphore_obtain SEM1 0 Obtain semaphore (0x1a010001) with timeout 0 CPU 0: Thread Heir: 0x09010001 priority=255 CPU 0: Thread Executing: 0x09010001 priority=255 +==> 11: semaphore_flush SEM1 Flushing semaphore (0x1a010001) CPU 0: Thread Heir: 0x0a010001 priority=1 CPU 0: Thread Executing: 0x0a010001 priority=1 +==> 12: echo "*** Now back to TA1 to do it differently" *** Now back to TA1 to do it differently +==> 13: semaphore_obtain SEM1 0 Obtain semaphore (0x1a010001) with timeout 0 CPU 0: Thread Heir: 0x0a010002 priority=2 CPU 0: Thread Executing: 0x0a010002 priority=2 +==> 14: semaphore_obtain SEM1 0 Obtain semaphore (0x1a010001) with timeout 0 CPU 0: Thread Heir: 0x0a010003 priority=3 CPU 0: Thread Executing: 0x0a010003 priority=3 +==> 15: semaphore_release SEM1 Releasing semaphore (0x1a010001) CPU 0: Thread Heir: 0x0a010001 priority=1 CPU 0: Thread Executing: 0x0a010001 priority=1 +==> 16: # as TA1 +==> 17: semaphore_obtain SEM1 0 Obtain semaphore (0x1a010001) with timeout 0 CPU 0: Thread Heir: 0x0a010003 priority=3 CPU 0: Thread Executing: 0x0a010003 priority=3 +==> 18: semaphore_delete SEM1 Deleting semaphore (0x1a010001) CPU 0: Thread Heir: 0x0a010001 priority=1 CPU 0: Thread Executing: 0x0a010001 priority=1 +==> 19: # should preempt +==> 20: echo "*** END OF TEST 05 ***" *** END OF TEST 05 *** +==> 21: exit diff --git a/schedsim/shell/schedsim_priority/scenarios/script06.expected b/schedsim/shell/schedsim_priority/scenarios/script06.expected index a9b5c48..7cc5ec0 100644 --- a/schedsim/shell/schedsim_priority/scenarios/script06.expected +++ b/schedsim/shell/schedsim_priority/scenarios/script06.expected @@ -1,27 +1,42 @@ +Script File : script06.scen +verbose : 1 +==> 1: echo "*** TEST 06 ***" *** TEST 06 *** +==> 2: rtems_init CPU 0: Thread Heir: 0x09010001 priority=255 CPU 0: Thread Executing: 0x09010001 priority=255 +==> 3: echo Create 0x0a010001 Create 0x0a010001 +==> 4: task_create TA1 1 Creating task with: Preemption: yes Timeslicing: no Task (TA1) created: id=0x0a010001, priority=1 Task (TA1) starting: id=0x0a010001, priority=1 CPU 0: Thread Heir: 0x0a010001 priority=1 CPU 0: Thread Executing: 0x0a010001 priority=1 +==> 5: task_create TA2 2 Creating task with: Preemption: yes Timeslicing: no Task (TA2) created: id=0x0a010002, priority=2 Task (TA2) starting: id=0x0a010002, priority=2 +==> 6: task_create TA3 3 Creating task with: Preemption: yes Timeslicing: no Task (TA3) created: id=0x0a010003, priority=3 Task (TA3) starting: id=0x0a010003, priority=3 +==> 7: semaphore_create SEM1 Semaphore (SEM1) created: id=0x1a010001 +==> 8: semaphore_obtain SEM1 0 Obtain semaphore (0x1a010001) with timeout 0 CPU 0: Thread Heir: 0x0a010002 priority=2 CPU 0: Thread Executing: 0x0a010002 priority=2 +==> 9: semaphore_obtain SEM1 0 Obtain semaphore (0x1a010001) with timeout 0 CPU 0: Thread Heir: 0x0a010003 priority=3 CPU 0: Thread Executing: 0x0a010003 priority=3 +==> 10: semaphore_release SEM1 Releasing semaphore (0x1a010001) CPU 0: Thread Heir: 0x0a010001 priority=1 CPU 0: Thread Executing: 0x0a010001 priority=1 +==> 11: semaphore_delete SEM1 Deleting semaphore (0x1a010001) +==> 12: echo "*** END OF TEST 06 ***" *** END OF TEST 06 *** +==> 13: exit -- cgit v1.2.3