Modify expect output log to meet the changes coming from per core run…

… queue

c/pthread/sleep/expect_info_smp4_fifo.out

@@ -20,64 +20,64 @@ Initialize interrupt handlers...
 Hello, main task!
 main task sleep for 1\.[0-9]\+s
   tick 0
-task 8 sleep 1 seconds (0) ...
-task 9 sleep 2 seconds (0) ...
-task 10 sleep 3 seconds (0) ...
-task 11 sleep 4 seconds (0) ...
-task 12 sleep 5 seconds (0) ...
+task 11 sleep 1 seconds (0) ...
+task 12 sleep 2 seconds (0) ...
+task 13 sleep 3 seconds (0) ...
+task 14 sleep 4 seconds (0) ...
+task 15 sleep 5 seconds (0) ...
   tick 1
-task 8 actually sleep 1\.[0-9]\+ seconds (0) ...
-task 8 sleep 1 seconds (1) ...
+task 11 actually sleep 1\.[0-9]\+ seconds (0) ...
+task 11 sleep 1 seconds (1) ...
   tick 2
   tick 3
-task 9 actually sleep 2\.[0-9]\+ seconds (0) ...
-task 9 sleep 2 seconds (1) ...
-task 8 actually sleep 1\.[0-9]\+ seconds (1) ...
-task 8 sleep 1 seconds (2) ...
+task 12 actually sleep 2\.[0-9]\+ seconds (0) ...
+task 12 sleep 2 seconds (1) ...
+task 11 actually sleep 1\.[0-9]\+ seconds (1) ...
+task 11 sleep 1 seconds (2) ...
   tick 4
   tick 5
-task 10 actually sleep 3\.[0-9]\+ seconds (0) ...
-task 10 sleep 3 seconds (1) ...
-task 8 actually sleep 1\.[0-9]\+ seconds (2) ...
+task 13 actually sleep 3\.[0-9]\+ seconds (0) ...
+task 13 sleep 3 seconds (1) ...
+task 11 actually sleep 1\.[0-9]\+ seconds (2) ...
   tick 6
   tick 7
-task 11 actually sleep 4\.[0-9]\+ seconds (0) ...
-task 11 sleep 4 seconds (1) ...
-task 9 actually sleep 2\.[0-9]\+ seconds (1) ...
-task 9 sleep 2 seconds (2) ...
+task 14 actually sleep 4\.[0-9]\+ seconds (0) ...
+task 14 sleep 4 seconds (1) ...
+task 12 actually sleep 2\.[0-9]\+ seconds (1) ...
+task 12 sleep 2 seconds (2) ...
   tick 8
   tick 9
-task 12 actually sleep 5\.[0-9]\+ seconds (0) ...
-task 12 sleep 5 seconds (1) ...
+task 15 actually sleep 5\.[0-9]\+ seconds (0) ...
+task 15 sleep 5 seconds (1) ...
   tick 10
   tick 11
-task 10 actually sleep 3\.[0-9]\+ seconds (1) ...
-task 10 sleep 3 seconds (2) ...
-task 9 actually sleep 2\.[0-9]\+ seconds (2) ...
+task 13 actually sleep 3\.[0-9]\+ seconds (1) ...
+task 13 sleep 3 seconds (2) ...
+task 12 actually sleep 2\.[0-9]\+ seconds (2) ...
   tick 12
   tick 13
   tick 14
   tick 15
-task 11 actually sleep 4\.[0-9]\+ seconds (1) ...
-task 11 sleep 4 seconds (2) ...
+task 14 actually sleep 4\.[0-9]\+ seconds (1) ...
+task 14 sleep 4 seconds (2) ...
   tick 16
   tick 17
-task 10 actually sleep 3\.[0-9]\+ seconds (2) ...
+task 13 actually sleep 3\.[0-9]\+ seconds (2) ...
   tick 18
   tick 19
-task 12 actually sleep 5\.[0-9]\+ seconds (1) ...
-task 12 sleep 5 seconds (2) ...
+task 15 actually sleep 5\.[0-9]\+ seconds (1) ...
+task 15 sleep 5 seconds (2) ...
   tick 20
   tick 21
   tick 22
   tick 23
-task 11 actually sleep 4\.[0-9]\+ seconds (2) ...
+task 14 actually sleep 4\.[0-9]\+ seconds (2) ...
   tick 24
   tick 25
   tick 26
   tick 27
   tick 28
   tick 29
-task 12 actually sleep 5\.[0-9]\+ seconds (2) ...
+task 15 actually sleep 5\.[0-9]\+ seconds (2) ...
 (C)Sleep tests run OK!
 Shutting down...

rust/task/priority/expect_info_smp4_cfs.out

@@ -22,16 +22,16 @@ Initialize scheduling...
   use Completely Fair scheduler.
 Initialize interrupt handlers...
 Primary CPU [0-9]\+ init OK.
-part 0: ThreadId(7) \[0, 40)
-part 1: ThreadId(8) \[0, 40)
-part 2: ThreadId(9) \[0, 40)
-part 3: ThreadId(10) \[0, 40)
-part 4: ThreadId(11) \[0, 4)
-part 0: ThreadId(7) finished
-part 1: ThreadId(8) finished
-part 2: ThreadId(9) finished
-part 3: ThreadId(10) finished
-part 4: ThreadId(11) finished
+part 0: ThreadId(10) \[0, 40)
+part 1: ThreadId(11) \[0, 40)
+part 2: ThreadId(12) \[0, 40)
+part 3: ThreadId(13) \[0, 40)
+part 4: ThreadId(14) \[0, 4)
+part 0: ThreadId(10) finished
+part 1: ThreadId(11) finished
+part 2: ThreadId(12) finished
+part 3: ThreadId(13) finished
+part 4: ThreadId(14) finished
 sum = 3318102132
 leave time:
 task 0 =

rust/task/yield/expect_info_smp4_fifo.out

@@ -24,15 +24,15 @@ CPU 1 init OK
 CPU 2 init OK
 CPU 3 init OK
 Hello, main task!
-Hello, task 0! id = ThreadId(7)
-Hello, task 1! id = ThreadId(8)
-Hello, task 2! id = ThreadId(9)
-Hello, task 3! id = ThreadId(10)
-Hello, task 4! id = ThreadId(11)
-Hello, task 5! id = ThreadId(12)
-Hello, task 6! id = ThreadId(13)
-Hello, task 7! id = ThreadId(14)
-Hello, task 8! id = ThreadId(15)
-Hello, task 9! id = ThreadId(16)
+Hello, task 0! id = ThreadId(10)
+Hello, task 1! id = ThreadId(11)
+Hello, task 2! id = ThreadId(12)
+Hello, task 3! id = ThreadId(13)
+Hello, task 4! id = ThreadId(14)
+Hello, task 5! id = ThreadId(15)
+Hello, task 6! id = ThreadId(16)
+Hello, task 7! id = ThreadId(17)
+Hello, task 8! id = ThreadId(18)
+Hello, task 9! id = ThreadId(19)
 Task yielding tests run OK!
 Shutting down...

rust/task/yield/expect_info_smp4_rr.out

@@ -24,15 +24,15 @@ CPU 1 init OK
 CPU 2 init OK
 CPU 3 init OK
 Hello, main task!
-Hello, task 0! id = ThreadId(7)
-Hello, task 1! id = ThreadId(8)
-Hello, task 2! id = ThreadId(9)
-Hello, task 3! id = ThreadId(10)
-Hello, task 4! id = ThreadId(11)
-Hello, task 5! id = ThreadId(12)
-Hello, task 6! id = ThreadId(13)
-Hello, task 7! id = ThreadId(14)
-Hello, task 8! id = ThreadId(15)
-Hello, task 9! id = ThreadId(16)
+Hello, task 0! id = ThreadId(10)
+Hello, task 1! id = ThreadId(11)
+Hello, task 2! id = ThreadId(12)
+Hello, task 3! id = ThreadId(13)
+Hello, task 4! id = ThreadId(14)
+Hello, task 5! id = ThreadId(15)
+Hello, task 6! id = ThreadId(16)
+Hello, task 7! id = ThreadId(17)
+Hello, task 8! id = ThreadId(18)
+Hello, task 9! id = ThreadId(19)
 Task yielding tests run OK!
 Shutting down...