Index: schedsim/shell/schedsim_priority/scenarios/script01.expected
===================================================================
--- schedsim/shell/schedsim_priority/scenarios/script01.expected	(revision f6fe059698079db9a284f036bd0c9965fa4352dd)
+++ schedsim/shell/schedsim_priority/scenarios/script01.expected	(revision d1f92810507b8749791a15ec17592a5c4b79dcfa)
@@ -1,6 +1,12 @@
+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
@@ -8,8 +14,11 @@
   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
@@ -17,6 +26,9 @@
   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
Index: schedsim/shell/schedsim_priority/scenarios/script02.expected
===================================================================
--- schedsim/shell/schedsim_priority/scenarios/script02.expected	(revision f6fe059698079db9a284f036bd0c9965fa4352dd)
+++ schedsim/shell/schedsim_priority/scenarios/script02.expected	(revision d1f92810507b8749791a15ec17592a5c4b79dcfa)
@@ -1,6 +1,12 @@
+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
@@ -8,7 +14,9 @@
   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) ...
@@ -20,3 +28,5 @@
 ClockTick (6) ...
 ClockTick (7) ...
+==> 7: echo "*** END OF TEST 2 ***"
 *** END OF TEST 2 ***
+==> 8: exit
Index: schedsim/shell/schedsim_priority/scenarios/script03.expected
===================================================================
--- schedsim/shell/schedsim_priority/scenarios/script03.expected	(revision f6fe059698079db9a284f036bd0c9965fa4352dd)
+++ schedsim/shell/schedsim_priority/scenarios/script03.expected	(revision d1f92810507b8749791a15ec17592a5c4b79dcfa)
@@ -1,6 +1,12 @@
+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
@@ -8,19 +14,19 @@
   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
Index: schedsim/shell/schedsim_priority/scenarios/script04.expected
===================================================================
--- schedsim/shell/schedsim_priority/scenarios/script04.expected	(revision f6fe059698079db9a284f036bd0c9965fa4352dd)
+++ schedsim/shell/schedsim_priority/scenarios/script04.expected	(revision d1f92810507b8749791a15ec17592a5c4b79dcfa)
@@ -1,6 +1,12 @@
+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
@@ -8,7 +14,9 @@
   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
@@ -16,6 +24,9 @@
   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
Index: schedsim/shell/schedsim_priority/scenarios/script05.expected
===================================================================
--- schedsim/shell/schedsim_priority/scenarios/script05.expected	(revision f6fe059698079db9a284f036bd0c9965fa4352dd)
+++ schedsim/shell/schedsim_priority/scenarios/script05.expected	(revision d1f92810507b8749791a15ec17592a5c4b79dcfa)
@@ -1,6 +1,12 @@
+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
@@ -8,38 +14,55 @@
   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
Index: schedsim/shell/schedsim_priority/scenarios/script06.expected
===================================================================
--- schedsim/shell/schedsim_priority/scenarios/script06.expected	(revision f6fe059698079db9a284f036bd0c9965fa4352dd)
+++ schedsim/shell/schedsim_priority/scenarios/script06.expected	(revision d1f92810507b8749791a15ec17592a5c4b79dcfa)
@@ -1,6 +1,12 @@
+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
@@ -8,20 +14,29 @@
   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
