schedsim_smpsimple: Remove scenarios that are no longer valid.

Non-preemptable tasks are not supported on an SMP system.

10 files changed, 0 insertions, 463 deletions

diff --git a/schedsim/shell/schedsim_smpsimple/scenarios/cpus1_mode.expected b/schedsim/shell/schedsim_smpsimple/scenarios/cpus1_mode.expected
deleted file mode 100644
index 34ad78c..0000000
--- a/schedsim/shell/schedsim_smpsimple/scenarios/cpus1_mode.expected
+++ /dev/null
@@ -1,42 +0,0 @@
-Script File               : scenarios/cpus1_mode.scen
-verbose                   : 1
-==> 1: #
-==> 2: #  Check increasing and decrease priority self with no change
-==> 3: #
-==> 4: rtems_init 1
-  Thread Heir: 0x09010001 priority=255
-  Thread Executing: 0x09010001 priority=255
-==> 5: task_create -p smp1 5
-Creating task with:  Preemption: no Timeslicing: no
-Task (smp1) created: id=0x0a010001, priority=5
-Task (smp1) starting: id=0x0a010001, priority=5
-  Thread Heir: 0x0a010001 priority=5
-  Thread Executing: 0x0a010001 priority=5
-==> 6: # GOAL: 0x0a010001 is heir and executing on CPU 0
-==> 7: cpus
-=== CPU Status
-            EXECUTING    /     HEIR         /    IDLE        /  SWITCH NEEDED
-  CPU 0: 0x0a010001 @  5 / 0x0a010001 @  5 / 0x09010001 @255         false
-=== End of Ready Set of Threads
-==> 8: task_create smp2 4
-Creating task with:  Preemption: yes Timeslicing: no
-Task (smp2) created: id=0x0a010002, priority=4
-Task (smp2) starting: id=0x0a010002, priority=4
-  Thread Heir: 0x0a010002 priority=4
-==> 9: # GOAL: 0x0a010001 is executing and 0x0a010002 is heir on CPU 0
-==> 10: cpus
-=== CPU Status
-            EXECUTING    /     HEIR         /    IDLE        /  SWITCH NEEDED
-  CPU 0: 0x0a010001 @  5 / 0x0a010002 @  4 / 0x09010001 @255         false
-=== End of Ready Set of Threads
-==> 11: 
-==> 12: task_mode -P
-  Thread Executing: 0x0a010002 priority=4
-Previous Mode: Preemption: no Timeslicing: no
-Current Mode:  Preemption: yes Timeslicing: no
-==> 13: # GOAL: 0x0a010002 is heir and executing on CPU 0
-==> 14: cpus
-=== CPU Status
-            EXECUTING    /     HEIR         /    IDLE        /  SWITCH NEEDED
-  CPU 0: 0x0a010002 @  4 / 0x0a010002 @  4 / 0x09010001 @255         false
-=== End of Ready Set of Threads
diff --git a/schedsim/shell/schedsim_smpsimple/scenarios/cpus1_mode.scen b/schedsim/shell/schedsim_smpsimple/scenarios/cpus1_mode.scen
deleted file mode 100644
index 21de2c7..0000000
--- a/schedsim/shell/schedsim_smpsimple/scenarios/cpus1_mode.scen
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-#  Check increasing and decrease priority self with no change
-#
-rtems_init 1
-task_create -p smp1 5
-# GOAL: 0x0a010001 is heir and executing on CPU 0
-cpus
-task_create smp2 4
-# GOAL: 0x0a010001 is executing and 0x0a010002 is heir on CPU 0
-cpus
-
-task_mode -P
-# GOAL: 0x0a010002 is heir and executing on CPU 0
-cpus
diff --git a/schedsim/shell/schedsim_smpsimple/scenarios/cpus4_mode_case1.expected b/schedsim/shell/schedsim_smpsimple/scenarios/cpus4_mode_case1.expected
deleted file mode 100644
index d3d4404..0000000
--- a/schedsim/shell/schedsim_smpsimple/scenarios/cpus4_mode_case1.expected
+++ /dev/null
@@ -1,87 +0,0 @@
-Script File               : scenarios/cpus4_mode_case1.scen
-verbose                   : 1
-==> 1: #
-==> 2: #  Show how having a non-preemptive task can create a
-==> 3: #  priority inversion and changing the mode to preemptive
-==> 4: #  resolves it.
-==> 5: #
-==> 6: rtems_init 4
-  Thread Heir: 0x09010001 priority=255
-  Thread Executing: 0x09010001 priority=255
-==> 7: task_create -p smp1 5
-Creating task with:  Preemption: no Timeslicing: no
-Task (smp1) created: id=0x0a010001, priority=5
-Task (smp1) starting: id=0x0a010001, priority=5
-  Thread Heir: 0x0a010001 priority=5
-  Thread Executing: 0x0a010001 priority=5
-==> 8: task_create smp2 5
-Creating task with:  Preemption: yes Timeslicing: no
-Task (smp2) created: id=0x0a010002, priority=5
-Task (smp2) starting: id=0x0a010002, priority=5
-==> 9: task_create smp3 5
-Creating task with:  Preemption: yes Timeslicing: no
-Task (smp3) created: id=0x0a010003, priority=5
-Task (smp3) starting: id=0x0a010003, priority=5
-==> 10: task_create smp4 5
-Creating task with:  Preemption: yes Timeslicing: no
-Task (smp4) created: id=0x0a010004, priority=5
-Task (smp4) starting: id=0x0a010004, priority=5
-==> 11: dispatch
-=== Invoke Thread Dispatch on CPU 1
-  Thread Heir: 0x0a010002 priority=5
-  Thread Executing: 0x09010002 priority=255
-  Thread Executing: 0x0a010002 priority=5
-=== Invoke Thread Dispatch on CPU 2
-  Thread Heir: 0x0a010003 priority=5
-  Thread Executing: 0x09010003 priority=255
-  Thread Executing: 0x0a010003 priority=5
-=== Invoke Thread Dispatch on CPU 3
-  Thread Heir: 0x0a010004 priority=5
-  Thread Executing: 0x09010004 priority=255
-  Thread Executing: 0x0a010004 priority=5
-==> 12: # GOAL: 0x0a010001 - 0x0a010004 are heir and executing
-==> 13: # GOAL:   on CPUs 0 - 3 respectively
-==> 14: cpus
-=== CPU Status
-            EXECUTING    /     HEIR         /    IDLE        /  SWITCH NEEDED
-  CPU 0: 0x0a010001 @  5 / 0x0a010001 @  5 / 0x09010001 @255         false
-  CPU 1: 0x0a010002 @  5 / 0x0a010002 @  5 / 0x09010002 @255         false
-  CPU 2: 0x0a010003 @  5 / 0x0a010003 @  5 / 0x09010003 @255         false
-  CPU 3: 0x0a010004 @  5 / 0x0a010004 @  5 / 0x09010004 @255         false
-=== End of Ready Set of Threads
-==> 15: 
-==> 16: task_create smp5 3
-Creating task with:  Preemption: yes Timeslicing: no
-  Thread Heir: 0x0a010001 priority=5
-  Thread Executing: 0x0a010001 priority=5
-Task (smp5) created: id=0x0a010005, priority=3
-Task (smp5) starting: id=0x0a010005, priority=3
-==> 17: dispatch
-=== Invoke Thread Dispatch on CPU 1
-  Thread Heir: 0x0a010005 priority=3
-  Thread Executing: 0x0a010002 priority=5
-  Thread Executing: 0x0a010005 priority=3
-==> 18: # GOAL: 0x0a010001, 0x0a010005, 0x0a010003, and 0x0a010004 are heir
-==> 19: # GOAL:   and executing on CPUs 0 - 3
-==> 20: cpus
-=== CPU Status
-            EXECUTING    /     HEIR         /    IDLE        /  SWITCH NEEDED
-  CPU 0: 0x0a010001 @  5 / 0x0a010001 @  5 / 0x09010001 @255         false
-  CPU 1: 0x0a010005 @  3 / 0x0a010005 @  3 / 0x09010002 @255         false
-  CPU 2: 0x0a010003 @  5 / 0x0a010003 @  5 / 0x09010003 @255         false
-  CPU 3: 0x0a010004 @  5 / 0x0a010004 @  5 / 0x09010004 @255         false
-=== End of Ready Set of Threads
-==> 21: 
-==> 22: task_mode -P
-Previous Mode: Preemption: no Timeslicing: no
-Current Mode:  Preemption: yes Timeslicing: no
-==> 23: # GOAL: 0x0a010001, 0x0a010005, 0x0a010003, and 0x0a010004 are heir
-==> 24: # GOAL:   and executing on CPUs 0 - 3
-==> 25: cpus
-=== CPU Status
-            EXECUTING    /     HEIR         /    IDLE        /  SWITCH NEEDED
-  CPU 0: 0x0a010001 @  5 / 0x0a010001 @  5 / 0x09010001 @255         false
-  CPU 1: 0x0a010005 @  3 / 0x0a010005 @  3 / 0x09010002 @255         false
-  CPU 2: 0x0a010003 @  5 / 0x0a010003 @  5 / 0x09010003 @255         false
-  CPU 3: 0x0a010004 @  5 / 0x0a010004 @  5 / 0x09010004 @255         false
-=== End of Ready Set of Threads
diff --git a/schedsim/shell/schedsim_smpsimple/scenarios/cpus4_mode_case1.scen b/schedsim/shell/schedsim_smpsimple/scenarios/cpus4_mode_case1.scen
deleted file mode 100644
index 0862ab5..0000000
--- a/schedsim/shell/schedsim_smpsimple/scenarios/cpus4_mode_case1.scen
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-#  Show how having a non-preemptive task can create a
-#  priority inversion and changing the mode to preemptive
-#  resolves it.
-#
-rtems_init 4
-task_create -p smp1 5
-task_create smp2 5
-task_create smp3 5
-task_create smp4 5
-dispatch
-# GOAL: 0x0a010001 - 0x0a010004 are heir and executing
-# GOAL:   on CPUs 0 - 3 respectively
-cpus
-
-task_create smp5 3
-# GOAL: 0x0a010001, 0x0a010005, 0x0a010003, and 0x0a010004 are heir
-# GOAL:   and executing on CPUs 0 - 3
-cpus
-
-task_mode -P
-# GOAL: 0x0a010001, 0x0a010005, 0x0a010003, and 0x0a010004 are heir
-# GOAL:   and executing on CPUs 0 - 3
-cpus
diff --git a/schedsim/shell/schedsim_smpsimple/scenarios/cpus4_mode_case2.expected b/schedsim/shell/schedsim_smpsimple/scenarios/cpus4_mode_case2.expected
deleted file mode 100644
index 6b0086f..0000000
--- a/schedsim/shell/schedsim_smpsimple/scenarios/cpus4_mode_case2.expected
+++ /dev/null
@@ -1,89 +0,0 @@
-Script File               : scenarios/cpus4_mode_case2.scen
-verbose                   : 1
-==> 1: #
-==> 2: #  Show how having a non-preemptive task can create a
-==> 3: #  priority inversion
-==> 4: #
-==> 5: rtems_init 4
-  Thread Heir: 0x09010001 priority=255
-  Thread Executing: 0x09010001 priority=255
-==> 6: task_create -p smp1 4
-Creating task with:  Preemption: no Timeslicing: no
-Task (smp1) created: id=0x0a010001, priority=4
-Task (smp1) starting: id=0x0a010001, priority=4
-  Thread Heir: 0x0a010001 priority=4
-  Thread Executing: 0x0a010001 priority=4
-==> 7: task_create -p smp2 5
-Creating task with:  Preemption: no Timeslicing: no
-Task (smp2) created: id=0x0a010002, priority=5
-Task (smp2) starting: id=0x0a010002, priority=5
-==> 8: task_create -p smp3 4
-Creating task with:  Preemption: no Timeslicing: no
-Task (smp3) created: id=0x0a010003, priority=4
-Task (smp3) starting: id=0x0a010003, priority=4
-==> 9: task_create -p smp4 4
-Creating task with:  Preemption: no Timeslicing: no
-Task (smp4) created: id=0x0a010004, priority=4
-Task (smp4) starting: id=0x0a010004, priority=4
-==> 10: dispatch
-=== Invoke Thread Dispatch on CPU 1
-  Thread Heir: 0x0a010002 priority=5
-  Thread Executing: 0x09010002 priority=255
-  Thread Executing: 0x0a010002 priority=5
-=== Invoke Thread Dispatch on CPU 2
-  Thread Heir: 0x0a010003 priority=4
-  Thread Executing: 0x09010003 priority=255
-  Thread Executing: 0x0a010003 priority=4
-=== Invoke Thread Dispatch on CPU 3
-  Thread Heir: 0x0a010004 priority=4
-  Thread Executing: 0x09010004 priority=255
-  Thread Executing: 0x0a010004 priority=4
-==> 11: # GOAL: 0x0a010001 - 0x0a010004 are heir and executing
-==> 12: # GOAL:   on CPUs 0 - 3 respectively
-==> 13: cpus
-=== CPU Status
-            EXECUTING    /     HEIR         /    IDLE        /  SWITCH NEEDED
-  CPU 0: 0x0a010001 @  4 / 0x0a010001 @  4 / 0x09010001 @255         false
-  CPU 1: 0x0a010002 @  5 / 0x0a010002 @  5 / 0x09010002 @255         false
-  CPU 2: 0x0a010003 @  4 / 0x0a010003 @  4 / 0x09010003 @255         false
-  CPU 3: 0x0a010004 @  4 / 0x0a010004 @  4 / 0x09010004 @255         false
-=== End of Ready Set of Threads
-==> 14: 
-==> 15: task_create smp5 3
-Creating task with:  Preemption: yes Timeslicing: no
-  Thread Heir: 0x0a010001 priority=4
-  Thread Executing: 0x0a010001 priority=4
-Task (smp5) created: id=0x0a010005, priority=3
-Task (smp5) starting: id=0x0a010005, priority=3
-==> 16: dispatch
-==> 17: # GOAL: 0x0a010001 - 0x0a010004 are executing on CPUs 0 - 3.
-==> 18: # GOAL:   All are also heir EXCEPT 0x0a010005 is heir on CPU 1.
-==> 19: # GOAL: **** SHOWS INVERSION - CPU 1 has NO PREEMPT TASK ****
-==> 20: cpus
-=== CPU Status
-            EXECUTING    /     HEIR         /    IDLE        /  SWITCH NEEDED
-  CPU 0: 0x0a010001 @  4 / 0x0a010001 @  4 / 0x09010001 @255         false
-  CPU 1: 0x0a010002 @  5 / 0x0a010005 @  3 / 0x09010002 @255         false
-  CPU 2: 0x0a010003 @  4 / 0x0a010003 @  4 / 0x09010003 @255         false
-  CPU 3: 0x0a010004 @  4 / 0x0a010004 @  4 / 0x09010004 @255         false
-=== End of Ready Set of Threads
-==> 21: 
-==> 22: current_cpu 1
-Changing current CPU from 0 to 1
-==> 23: task_mode -P
-  Thread Heir: 0x0a010005 priority=3
-  Thread Executing: 0x0a010002 priority=5
-  Thread Executing: 0x0a010005 priority=3
-Previous Mode: Preemption: no Timeslicing: no
-Current Mode:  Preemption: yes Timeslicing: no
-==> 24: dispatch
-==> 25: # GOAL: 0x0a010001, 0x0a010005, 0x0a010003, and 0x0a010004 are
-==> 26: # GOAL:   heir and executing on CPUs 0 - 3
-==> 27: cpus
-=== CPU Status
-            EXECUTING    /     HEIR         /    IDLE        /  SWITCH NEEDED
-  CPU 0: 0x0a010001 @  4 / 0x0a010001 @  4 / 0x09010001 @255         false
-  CPU 1: 0x0a010005 @  3 / 0x0a010005 @  3 / 0x09010002 @255         false
-  CPU 2: 0x0a010003 @  4 / 0x0a010003 @  4 / 0x09010003 @255         false
-  CPU 3: 0x0a010004 @  4 / 0x0a010004 @  4 / 0x09010004 @255         false
-=== End of Ready Set of Threads
diff --git a/schedsim/shell/schedsim_smpsimple/scenarios/cpus4_mode_case2.scen b/schedsim/shell/schedsim_smpsimple/scenarios/cpus4_mode_case2.scen
deleted file mode 100644
index 81cf879..0000000
--- a/schedsim/shell/schedsim_smpsimple/scenarios/cpus4_mode_case2.scen
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-#  Show how having a non-preemptive task can create a
-#  priority inversion
-#
-rtems_init 4
-task_create -p smp1 4
-task_create -p smp2 5
-task_create -p smp3 4
-task_create -p smp4 4
-dispatch
-# GOAL: 0x0a010001 - 0x0a010004 are heir and executing
-# GOAL:   on CPUs 0 - 3 respectively
-cpus
-
-task_create smp5 3
-# GOAL: 0x0a010001 - 0x0a010004 are executing on CPUs 0 - 3.
-# GOAL:   All are also heir EXCEPT 0x0a010005 is heir on CPU 1.
-# GOAL: **** SHOWS INVERSION - CPU 1 has NO PREEMPT TASK ****
-cpus
-
-current_cpu 1
-task_mode -P
-# GOAL: 0x0a010001, 0x0a010005, 0x0a010003, and 0x0a010004 are
-# GOAL:   heir and executing on CPUs 0 - 3
-cpus
diff --git a/schedsim/shell/schedsim_smpsimple/scenarios/cpus4_nonpreempt_case1.expected b/schedsim/shell/schedsim_smpsimple/scenarios/cpus4_nonpreempt_case1.expected
deleted file mode 100644
index f5069e1..0000000
--- a/schedsim/shell/schedsim_smpsimple/scenarios/cpus4_nonpreempt_case1.expected
+++ /dev/null
@@ -1,72 +0,0 @@
-Script File               : scenarios/cpus4_nonpreempt_case1.scen
-verbose                   : 1
-==> 1: #
-==> 2: #  Show how having a non-preemptive task can create a
-==> 3: #  priority inversion
-==> 4: #
-==> 5: rtems_init 4
-  Thread Heir: 0x09010001 priority=255
-  Thread Executing: 0x09010001 priority=255
-==> 6: task_create -p smp1 5
-Creating task with:  Preemption: no Timeslicing: no
-Task (smp1) created: id=0x0a010001, priority=5
-Task (smp1) starting: id=0x0a010001, priority=5
-  Thread Heir: 0x0a010001 priority=5
-  Thread Executing: 0x0a010001 priority=5
-==> 7: task_create smp2 5
-Creating task with:  Preemption: yes Timeslicing: no
-Task (smp2) created: id=0x0a010002, priority=5
-Task (smp2) starting: id=0x0a010002, priority=5
-==> 8: task_create smp3 5
-Creating task with:  Preemption: yes Timeslicing: no
-Task (smp3) created: id=0x0a010003, priority=5
-Task (smp3) starting: id=0x0a010003, priority=5
-==> 9: task_create smp4 5
-Creating task with:  Preemption: yes Timeslicing: no
-Task (smp4) created: id=0x0a010004, priority=5
-Task (smp4) starting: id=0x0a010004, priority=5
-==> 10: dispatch
-=== Invoke Thread Dispatch on CPU 1
-  Thread Heir: 0x0a010002 priority=5
-  Thread Executing: 0x09010002 priority=255
-  Thread Executing: 0x0a010002 priority=5
-=== Invoke Thread Dispatch on CPU 2
-  Thread Heir: 0x0a010003 priority=5
-  Thread Executing: 0x09010003 priority=255
-  Thread Executing: 0x0a010003 priority=5
-=== Invoke Thread Dispatch on CPU 3
-  Thread Heir: 0x0a010004 priority=5
-  Thread Executing: 0x09010004 priority=255
-  Thread Executing: 0x0a010004 priority=5
-==> 11: # GOAL: 0x0a010001 - 0x0a010004 are heir and executing
-==> 12: # GOAL:   on CPUs 0 - 3 respectively
-==> 13: cpus
-=== CPU Status
-            EXECUTING    /     HEIR         /    IDLE        /  SWITCH NEEDED
-  CPU 0: 0x0a010001 @  5 / 0x0a010001 @  5 / 0x09010001 @255         false
-  CPU 1: 0x0a010002 @  5 / 0x0a010002 @  5 / 0x09010002 @255         false
-  CPU 2: 0x0a010003 @  5 / 0x0a010003 @  5 / 0x09010003 @255         false
-  CPU 3: 0x0a010004 @  5 / 0x0a010004 @  5 / 0x09010004 @255         false
-=== End of Ready Set of Threads
-==> 14: 
-==> 15: task_create smp5 3
-Creating task with:  Preemption: yes Timeslicing: no
-  Thread Heir: 0x0a010001 priority=5
-  Thread Executing: 0x0a010001 priority=5
-Task (smp5) created: id=0x0a010005, priority=3
-Task (smp5) starting: id=0x0a010005, priority=3
-==> 16: dispatch
-=== Invoke Thread Dispatch on CPU 1
-  Thread Heir: 0x0a010005 priority=3
-  Thread Executing: 0x0a010002 priority=5
-  Thread Executing: 0x0a010005 priority=3
-==> 17: # GOAL: 0x0a010001, 0x0a010005, 0x0a010003, and 0x0a010004 are heir
-==> 18: # GOAL:   and executing on CPUs 0 - 3
-==> 19: cpus
-=== CPU Status
-            EXECUTING    /     HEIR         /    IDLE        /  SWITCH NEEDED
-  CPU 0: 0x0a010001 @  5 / 0x0a010001 @  5 / 0x09010001 @255         false
-  CPU 1: 0x0a010005 @  3 / 0x0a010005 @  3 / 0x09010002 @255         false
-  CPU 2: 0x0a010003 @  5 / 0x0a010003 @  5 / 0x09010003 @255         false
-  CPU 3: 0x0a010004 @  5 / 0x0a010004 @  5 / 0x09010004 @255         false
-=== End of Ready Set of Threads
diff --git a/schedsim/shell/schedsim_smpsimple/scenarios/cpus4_nonpreempt_case1.scen b/schedsim/shell/schedsim_smpsimple/scenarios/cpus4_nonpreempt_case1.scen
deleted file mode 100644
index 24af429..0000000
--- a/schedsim/shell/schedsim_smpsimple/scenarios/cpus4_nonpreempt_case1.scen
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-#  Show how having a non-preemptive task can create a
-#  priority inversion
-#
-rtems_init 4
-task_create -p smp1 5
-task_create smp2 5
-task_create smp3 5
-task_create smp4 5
-# GOAL: 0x0a010001 - 0x0a010004 are heir and executing
-# GOAL:   on CPUs 0 - 3 respectively
-cpus
-
-task_create smp5 3
-# GOAL: 0x0a010001, 0x0a010005, 0x0a010003, and 0x0a010004 are heir
-# GOAL:   and executing on CPUs 0 - 3
-cpus
diff --git a/schedsim/shell/schedsim_smpsimple/scenarios/cpus4_simple_nopreempt.expected b/schedsim/shell/schedsim_smpsimple/scenarios/cpus4_simple_nopreempt.expected
deleted file mode 100644
index fad7357..0000000
--- a/schedsim/shell/schedsim_smpsimple/scenarios/cpus4_simple_nopreempt.expected
+++ /dev/null
@@ -1,75 +0,0 @@
-Script File               : scenarios/cpus4_simple_nopreempt.scen
-verbose                   : 1
-==> 1: #
-==> 2: #  Verify no-preempt is honored
-==> 3: #
-==> 4: rtems_init 4
-  Thread Heir: 0x09010001 priority=255
-  Thread Executing: 0x09010001 priority=255
-==> 5: task_create -p smp1 5
-Creating task with:  Preemption: no Timeslicing: no
-Task (smp1) created: id=0x0a010001, priority=5
-Task (smp1) starting: id=0x0a010001, priority=5
-  Thread Heir: 0x0a010001 priority=5
-  Thread Executing: 0x0a010001 priority=5
-==> 6: task_create -p smp2 6
-Creating task with:  Preemption: no Timeslicing: no
-Task (smp2) created: id=0x0a010002, priority=6
-Task (smp2) starting: id=0x0a010002, priority=6
-==> 7: task_create -p smp3 7
-Creating task with:  Preemption: no Timeslicing: no
-Task (smp3) created: id=0x0a010003, priority=7
-Task (smp3) starting: id=0x0a010003, priority=7
-==> 8: task_create -p smp4 8
-Creating task with:  Preemption: no Timeslicing: no
-Task (smp4) created: id=0x0a010004, priority=8
-Task (smp4) starting: id=0x0a010004, priority=8
-==> 9: dispatch
-=== Invoke Thread Dispatch on CPU 1
-  Thread Heir: 0x0a010002 priority=6
-  Thread Executing: 0x09010002 priority=255
-  Thread Executing: 0x0a010002 priority=6
-=== Invoke Thread Dispatch on CPU 2
-  Thread Heir: 0x0a010003 priority=7
-  Thread Executing: 0x09010003 priority=255
-  Thread Executing: 0x0a010003 priority=7
-=== Invoke Thread Dispatch on CPU 3
-  Thread Heir: 0x0a010004 priority=8
-  Thread Executing: 0x09010004 priority=255
-  Thread Executing: 0x0a010004 priority=8
-==> 10: # GOAL: Tasks 0x0a010001 to 0x0a010004 as heir and executing on
-==> 11: # GOAL:    CPUs 1 - 4, respectively.
-==> 12: cpus
-=== CPU Status
-            EXECUTING    /     HEIR         /    IDLE        /  SWITCH NEEDED
-  CPU 0: 0x0a010001 @  5 / 0x0a010001 @  5 / 0x09010001 @255         false
-  CPU 1: 0x0a010002 @  6 / 0x0a010002 @  6 / 0x09010002 @255         false
-  CPU 2: 0x0a010003 @  7 / 0x0a010003 @  7 / 0x09010003 @255         false
-  CPU 3: 0x0a010004 @  8 / 0x0a010004 @  8 / 0x09010004 @255         false
-=== End of Ready Set of Threads
-==> 13: # Tasks are created and distributed across CPUs
-==> 14: task_create smp5 1
-Creating task with:  Preemption: yes Timeslicing: no
-  Thread Heir: 0x0a010001 priority=5
-  Thread Executing: 0x0a010001 priority=5
-Task (smp5) created: id=0x0a010005, priority=1
-Task (smp5) starting: id=0x0a010005, priority=1
-==> 15: # GOAL: Task 0x0a010005 is heir but 0x0a010004 is executing on CPU 4
-==> 16: cpus
-=== CPU Status
-            EXECUTING    /     HEIR         /    IDLE        /  SWITCH NEEDED
-  CPU 0: 0x0a010001 @  5 / 0x0a010001 @  5 / 0x09010001 @255         false
-  CPU 1: 0x0a010002 @  6 / 0x0a010002 @  6 / 0x09010002 @255         false
-  CPU 2: 0x0a010003 @  7 / 0x0a010003 @  7 / 0x09010003 @255         false
-  CPU 3: 0x0a010004 @  8 / 0x0a010005 @  1 / 0x09010004 @255         false
-=== End of Ready Set of Threads
-==> 17: dispatch
-==> 18: # GOAL: Task 0x0a010005 is heir but 0x0a010004 is executing on CPU 4
-==> 19: cpus
-=== CPU Status
-            EXECUTING    /     HEIR         /    IDLE        /  SWITCH NEEDED
-  CPU 0: 0x0a010001 @  5 / 0x0a010001 @  5 / 0x09010001 @255         false
-  CPU 1: 0x0a010002 @  6 / 0x0a010002 @  6 / 0x09010002 @255         false
-  CPU 2: 0x0a010003 @  7 / 0x0a010003 @  7 / 0x09010003 @255         false
-  CPU 3: 0x0a010004 @  8 / 0x0a010005 @  1 / 0x09010004 @255         false
-=== End of Ready Set of Threads
diff --git a/schedsim/shell/schedsim_smpsimple/scenarios/cpus4_simple_nopreempt.scen b/schedsim/shell/schedsim_smpsimple/scenarios/cpus4_simple_nopreempt.scen
deleted file mode 100644
index ba6d844..0000000
--- a/schedsim/shell/schedsim_smpsimple/scenarios/cpus4_simple_nopreempt.scen
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-#  Verify no-preempt is honored
-#
-rtems_init 4
-task_create -p smp1 5
-task_create -p smp2 6
-task_create -p smp3 7
-task_create -p smp4 8
-dispatch
-# GOAL: Tasks 0x0a010001 to 0x0a010004 as heir and executing on
-# GOAL:    CPUs 1 - 4, respectively.
-cpus
-# Tasks are created and distributed across CPUs
-task_create smp5 1
-# GOAL: Task 0x0a010005 is heir but 0x0a010004 is executing on CPU 4
-cpus
-# GOAL: Task 0x0a010005 is heir but 0x0a010004 is executing on CPU 4
-cpus