From d9ea4ab9af104e32c4a2238b6635e611fb895b3a Mon Sep 17 00:00:00 2001 From: Jennifer Averett Date: Tue, 27 May 2014 09:46:10 -0500 Subject: schedsim_smppriority_affinity: Change expected scenaoro filenames to not include path. --- .../scenarios/cpus1_exercise_affinity_api.expected | 2 +- .../scenarios/cpus2_affinity_case1.expected | 2 +- .../scenarios/cpus2_affinity_case2.expected | 2 +- .../scenarios/cpus2_affinity_migrate_case1.expected | 2 +- .../scenarios/cpus2_affinity_migrate_case2.expected | 2 +- .../scenarios/cpus4_affinity_api_case1.expected | 8 +------- .../scenarios/cpus4_affinity_api_case2.expected | 2 +- .../scenarios/cpus4_affinity_block_case1.expected | 2 +- .../scenarios/cpus4_affinity_migrate_case1.expected | 2 +- .../scenarios/cpus4_affinity_migrate_case2.expected | 2 +- .../scenarios/cpus4_affinity_migrate_case3.expected | 2 +- .../scenarios/cpus4_affinity_overlap_case1.expected | 2 +- .../scenarios/cpus4_affinity_priority_case1.expected | 2 +- .../scenarios/cpus4_affinity_priority_case2.expected | 2 +- .../scenarios/cpus4_affinity_priority_case3.expected | 2 +- 15 files changed, 15 insertions(+), 21 deletions(-) diff --git a/schedsim/shell/schedsim_smppriority_affinity/scenarios/cpus1_exercise_affinity_api.expected b/schedsim/shell/schedsim_smppriority_affinity/scenarios/cpus1_exercise_affinity_api.expected index 32f5010..a416685 100644 --- a/schedsim/shell/schedsim_smppriority_affinity/scenarios/cpus1_exercise_affinity_api.expected +++ b/schedsim/shell/schedsim_smppriority_affinity/scenarios/cpus1_exercise_affinity_api.expected @@ -1,4 +1,4 @@ -Script File : scenarios/cpus1_exercise_affinity_api.scen +Script File : cpus1_exercise_affinity_api.scen verbose : 1 ==> 1: # ==> 2: # Verify that affinity on 1 core diff --git a/schedsim/shell/schedsim_smppriority_affinity/scenarios/cpus2_affinity_case1.expected b/schedsim/shell/schedsim_smppriority_affinity/scenarios/cpus2_affinity_case1.expected index e91baf8..71a794b 100644 --- a/schedsim/shell/schedsim_smppriority_affinity/scenarios/cpus2_affinity_case1.expected +++ b/schedsim/shell/schedsim_smppriority_affinity/scenarios/cpus2_affinity_case1.expected @@ -1,4 +1,4 @@ -Script File : scenarios/cpus2_affinity_case1.scen +Script File : cpus2_affinity_case1.scen verbose : 1 ==> 1: # ==> 2: # Force Cores such that the first created task diff --git a/schedsim/shell/schedsim_smppriority_affinity/scenarios/cpus2_affinity_case2.expected b/schedsim/shell/schedsim_smppriority_affinity/scenarios/cpus2_affinity_case2.expected index 993cc0d..f35bd9f 100644 --- a/schedsim/shell/schedsim_smppriority_affinity/scenarios/cpus2_affinity_case2.expected +++ b/schedsim/shell/schedsim_smppriority_affinity/scenarios/cpus2_affinity_case2.expected @@ -1,4 +1,4 @@ -Script File : scenarios/cpus2_affinity_case2.scen +Script File : cpus2_affinity_case2.scen verbose : 1 ==> 1: # ==> 2: # Force Cores such that the first created task diff --git a/schedsim/shell/schedsim_smppriority_affinity/scenarios/cpus2_affinity_migrate_case1.expected b/schedsim/shell/schedsim_smppriority_affinity/scenarios/cpus2_affinity_migrate_case1.expected index 77f50b8..64d990f 100644 --- a/schedsim/shell/schedsim_smppriority_affinity/scenarios/cpus2_affinity_migrate_case1.expected +++ b/schedsim/shell/schedsim_smppriority_affinity/scenarios/cpus2_affinity_migrate_case1.expected @@ -1,4 +1,4 @@ -Script File : scenarios/cpus2_affinity_migrate_case1.scen +Script File : cpus2_affinity_migrate_case1.scen verbose : 1 ==> 1: # ==> 2: # Create a second task that forces and existing diff --git a/schedsim/shell/schedsim_smppriority_affinity/scenarios/cpus2_affinity_migrate_case2.expected b/schedsim/shell/schedsim_smppriority_affinity/scenarios/cpus2_affinity_migrate_case2.expected index 7aa4200..0468a0b 100644 --- a/schedsim/shell/schedsim_smppriority_affinity/scenarios/cpus2_affinity_migrate_case2.expected +++ b/schedsim/shell/schedsim_smppriority_affinity/scenarios/cpus2_affinity_migrate_case2.expected @@ -1,4 +1,4 @@ -Script File : scenarios/cpus2_affinity_migrate_case2.scen +Script File : cpus2_affinity_migrate_case2.scen verbose : 1 ==> 1: # ==> 2: # Create a second task that is lower priority than diff --git a/schedsim/shell/schedsim_smppriority_affinity/scenarios/cpus4_affinity_api_case1.expected b/schedsim/shell/schedsim_smppriority_affinity/scenarios/cpus4_affinity_api_case1.expected index ff0b6ae..ee8aaf9 100644 --- a/schedsim/shell/schedsim_smppriority_affinity/scenarios/cpus4_affinity_api_case1.expected +++ b/schedsim/shell/schedsim_smppriority_affinity/scenarios/cpus4_affinity_api_case1.expected @@ -1,4 +1,4 @@ -Script File : scenarios/cpus4_affinity_api_case1.scen +Script File : cpus4_affinity_api_case1.scen verbose : 1 ==> 1: # ==> 2: # Verify that affinity APIs work with the right values @@ -74,9 +74,3 @@ Task (0x0a010005) Get affinity=0x00000004 Task (0x0a010005) Set affinity=0x00000008 ==> 27: task_get_affinity smp5 Task (0x0a010005) Get affinity=0x00000008 -==> 28: -==> 29: # GOAL This should fail. -==> 30: task_set_affinity smp5 0x10 -==> 31: task_get_affinity smp5 -Task (0x0a010005) Get affinity=0x00000008 -==> 32: diff --git a/schedsim/shell/schedsim_smppriority_affinity/scenarios/cpus4_affinity_api_case2.expected b/schedsim/shell/schedsim_smppriority_affinity/scenarios/cpus4_affinity_api_case2.expected index 54aa750..a52e960 100644 --- a/schedsim/shell/schedsim_smppriority_affinity/scenarios/cpus4_affinity_api_case2.expected +++ b/schedsim/shell/schedsim_smppriority_affinity/scenarios/cpus4_affinity_api_case2.expected @@ -1,4 +1,4 @@ -Script File : scenarios/cpus4_affinity_api_case2.scen +Script File : cpus4_affinity_api_case2.scen verbose : 1 ==> 1: # ==> 2: # Verify that affinity APIs work with the right values diff --git a/schedsim/shell/schedsim_smppriority_affinity/scenarios/cpus4_affinity_block_case1.expected b/schedsim/shell/schedsim_smppriority_affinity/scenarios/cpus4_affinity_block_case1.expected index b5cd598..d1d6eab 100644 --- a/schedsim/shell/schedsim_smppriority_affinity/scenarios/cpus4_affinity_block_case1.expected +++ b/schedsim/shell/schedsim_smppriority_affinity/scenarios/cpus4_affinity_block_case1.expected @@ -1,4 +1,4 @@ -Script File : scenarios/cpus4_affinity_block_case1.scen +Script File : cpus4_affinity_block_case1.scen verbose : 1 ==> 1: # ==> 2: # Block a thread in an application with thread affinity and diff --git a/schedsim/shell/schedsim_smppriority_affinity/scenarios/cpus4_affinity_migrate_case1.expected b/schedsim/shell/schedsim_smppriority_affinity/scenarios/cpus4_affinity_migrate_case1.expected index 51876b8..27359a2 100644 --- a/schedsim/shell/schedsim_smppriority_affinity/scenarios/cpus4_affinity_migrate_case1.expected +++ b/schedsim/shell/schedsim_smppriority_affinity/scenarios/cpus4_affinity_migrate_case1.expected @@ -1,4 +1,4 @@ -Script File : scenarios/cpus4_affinity_migrate_case1.scen +Script File : cpus4_affinity_migrate_case1.scen verbose : 1 ==> 1: # ==> 2: # Create 5 tasks of the same priority. Then diff --git a/schedsim/shell/schedsim_smppriority_affinity/scenarios/cpus4_affinity_migrate_case2.expected b/schedsim/shell/schedsim_smppriority_affinity/scenarios/cpus4_affinity_migrate_case2.expected index d145e79..b6bc214 100644 --- a/schedsim/shell/schedsim_smppriority_affinity/scenarios/cpus4_affinity_migrate_case2.expected +++ b/schedsim/shell/schedsim_smppriority_affinity/scenarios/cpus4_affinity_migrate_case2.expected @@ -1,4 +1,4 @@ -Script File : scenarios/cpus4_affinity_migrate_case2.scen +Script File : cpus4_affinity_migrate_case2.scen verbose : 1 ==> 1: # ==> 2: # Create threads of single cpu affinity to fill the diff --git a/schedsim/shell/schedsim_smppriority_affinity/scenarios/cpus4_affinity_migrate_case3.expected b/schedsim/shell/schedsim_smppriority_affinity/scenarios/cpus4_affinity_migrate_case3.expected index cfc508d..0f4d13d 100644 --- a/schedsim/shell/schedsim_smppriority_affinity/scenarios/cpus4_affinity_migrate_case3.expected +++ b/schedsim/shell/schedsim_smppriority_affinity/scenarios/cpus4_affinity_migrate_case3.expected @@ -1,4 +1,4 @@ -Script File : scenarios/cpus4_affinity_migrate_case3.scen +Script File : cpus4_affinity_migrate_case3.scen verbose : 1 ==> 1: # ==> 2: # Worst case migration triggered by a set prioriity with diff --git a/schedsim/shell/schedsim_smppriority_affinity/scenarios/cpus4_affinity_overlap_case1.expected b/schedsim/shell/schedsim_smppriority_affinity/scenarios/cpus4_affinity_overlap_case1.expected index 97e723f..e6acaf5 100644 --- a/schedsim/shell/schedsim_smppriority_affinity/scenarios/cpus4_affinity_overlap_case1.expected +++ b/schedsim/shell/schedsim_smppriority_affinity/scenarios/cpus4_affinity_overlap_case1.expected @@ -1,4 +1,4 @@ -Script File : scenarios/cpus4_affinity_overlap_case1.scen +Script File : cpus4_affinity_overlap_case1.scen verbose : 1 ==> 1: # ==> 2: # Create 2 sets of threads one that can run on cpus diff --git a/schedsim/shell/schedsim_smppriority_affinity/scenarios/cpus4_affinity_priority_case1.expected b/schedsim/shell/schedsim_smppriority_affinity/scenarios/cpus4_affinity_priority_case1.expected index 562d291..e4fc5f4 100644 --- a/schedsim/shell/schedsim_smppriority_affinity/scenarios/cpus4_affinity_priority_case1.expected +++ b/schedsim/shell/schedsim_smppriority_affinity/scenarios/cpus4_affinity_priority_case1.expected @@ -1,4 +1,4 @@ -Script File : scenarios/cpus4_affinity_priority_case1.scen +Script File : cpus4_affinity_priority_case1.scen verbose : 1 ==> 1: # ==> 2: # Ensure lowest priority is preempted diff --git a/schedsim/shell/schedsim_smppriority_affinity/scenarios/cpus4_affinity_priority_case2.expected b/schedsim/shell/schedsim_smppriority_affinity/scenarios/cpus4_affinity_priority_case2.expected index e069da4..5e16804 100644 --- a/schedsim/shell/schedsim_smppriority_affinity/scenarios/cpus4_affinity_priority_case2.expected +++ b/schedsim/shell/schedsim_smppriority_affinity/scenarios/cpus4_affinity_priority_case2.expected @@ -1,4 +1,4 @@ -Script File : scenarios/cpus4_affinity_priority_case2.scen +Script File : cpus4_affinity_priority_case2.scen verbose : 1 ==> 1: # ==> 2: # Ensure lowest priority is preempted diff --git a/schedsim/shell/schedsim_smppriority_affinity/scenarios/cpus4_affinity_priority_case3.expected b/schedsim/shell/schedsim_smppriority_affinity/scenarios/cpus4_affinity_priority_case3.expected index 9cbb4dd..928aaff 100644 --- a/schedsim/shell/schedsim_smppriority_affinity/scenarios/cpus4_affinity_priority_case3.expected +++ b/schedsim/shell/schedsim_smppriority_affinity/scenarios/cpus4_affinity_priority_case3.expected @@ -1,4 +1,4 @@ -Script File : scenarios/cpus4_affinity_priority_case3.scen +Script File : cpus4_affinity_priority_case3.scen verbose : 1 ==> 1: # ==> 2: # Exercise priority and affinity. -- cgit v1.2.3