From ace4d8a638988a283f378b9f848a48dab8fb35bb Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Thu, 9 Nov 2017 23:47:48 +0100 Subject: [PATCH] PIDs are non-deterministic when several processes have the same start-time. Introduce a slight delay between processes to fix tests. --- .../test-hbp1.0-hbp3.0-hbp4.0.xml | 2 +- .../trace_integration/test-hbp2.5-hbp1.5.xml | 2 +- .../trace_integration/trace_integration.tesh | 36 +++++++++---------- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/teshsuite/msg/trace_integration/test-hbp1.0-hbp3.0-hbp4.0.xml b/teshsuite/msg/trace_integration/test-hbp1.0-hbp3.0-hbp4.0.xml index 7de0dc6231..7b14f7877f 100644 --- a/teshsuite/msg/trace_integration/test-hbp1.0-hbp3.0-hbp4.0.xml +++ b/teshsuite/msg/trace_integration/test-hbp1.0-hbp3.0-hbp4.0.xml @@ -5,7 +5,7 @@ - + diff --git a/teshsuite/msg/trace_integration/test-hbp2.5-hbp1.5.xml b/teshsuite/msg/trace_integration/test-hbp2.5-hbp1.5.xml index 004873453d..e8466466cf 100644 --- a/teshsuite/msg/trace_integration/test-hbp2.5-hbp1.5.xml +++ b/teshsuite/msg/trace_integration/test-hbp2.5-hbp1.5.xml @@ -5,7 +5,7 @@ - + diff --git a/teshsuite/msg/trace_integration/trace_integration.tesh b/teshsuite/msg/trace_integration/trace_integration.tesh index 90ac5a7a9e..58b9ad9211 100644 --- a/teshsuite/msg/trace_integration/trace_integration.tesh +++ b/teshsuite/msg/trace_integration/trace_integration.tesh @@ -123,10 +123,10 @@ $ ./trace_integration ${srcdir:=.}/../../../examples/platforms/two_hosts_platfor > [ 10.000000] (1:test_trace@Cpu B) Testing the trace integration cpu model: CpuTI > [ 10.000000] (1:test_trace@Cpu B) Task size: 50.000000 > [ 10.000000] (1:test_trace@Cpu B) Task prio: 2.500000 -> [ 10.000000] (2:test_trace@Cpu B) Testing the trace integration cpu model: CpuTI -> [ 10.000000] (2:test_trace@Cpu B) Task size: 70.000000 -> [ 10.000000] (2:test_trace@Cpu B) Task prio: 1.500000 -> [ 20.000000] (1:test_trace@Cpu B) Test finished +> [ 10.500000] (2:test_trace@Cpu B) Testing the trace integration cpu model: CpuTI +> [ 10.500000] (2:test_trace@Cpu B) Task size: 70.000000 +> [ 10.500000] (2:test_trace@Cpu B) Task prio: 1.500000 +> [ 19.700000] (1:test_trace@Cpu B) Test finished > [ 30.000000] (2:test_trace@Cpu B) Test finished p Testing trace integration using trace_B.txt and test-hbp2.5-hbp1.5.xml, two process with different priority (included) @@ -139,10 +139,10 @@ $ ./trace_integration ${srcdir:=.}/../../../examples/platforms/two_hosts_platfor > [ 10.000000] (1:test_trace@Cpu B) Testing the trace integration cpu model: CpuTI > [ 10.000000] (1:test_trace@Cpu B) Task size: 50.000000 > [ 10.000000] (1:test_trace@Cpu B) Task prio: 2.500000 -> [ 10.000000] (2:test_trace@Cpu B) Testing the trace integration cpu model: CpuTI -> [ 10.000000] (2:test_trace@Cpu B) Task size: 70.000000 -> [ 10.000000] (2:test_trace@Cpu B) Task prio: 1.500000 -> [ 20.000000] (1:test_trace@Cpu B) Test finished +> [ 10.500000] (2:test_trace@Cpu B) Testing the trace integration cpu model: CpuTI +> [ 10.500000] (2:test_trace@Cpu B) Task size: 70.000000 +> [ 10.500000] (2:test_trace@Cpu B) Task prio: 1.500000 +> [ 19.700000] (1:test_trace@Cpu B) Test finished > [ 30.000000] (2:test_trace@Cpu B) Test finished p Testing trace integration using trace_B.txt and test-hbp1.0-hbp1.0-hbp1.0.xml, three process with same priority @@ -175,14 +175,14 @@ $ ./trace_integration ${srcdir:=.}/../../../examples/platforms/two_hosts_platfor > [ 10.000000] (1:test_trace@Cpu B) Testing the trace integration cpu model: CpuTI > [ 10.000000] (1:test_trace@Cpu B) Task size: 25.000000 > [ 10.000000] (1:test_trace@Cpu B) Task prio: 1.000000 -> [ 10.000000] (2:test_trace@Cpu B) Testing the trace integration cpu model: CpuTI -> [ 10.000000] (2:test_trace@Cpu B) Task size: 75.000000 -> [ 10.000000] (2:test_trace@Cpu B) Task prio: 3.000000 +> [ 10.500000] (2:test_trace@Cpu B) Testing the trace integration cpu model: CpuTI +> [ 10.500000] (2:test_trace@Cpu B) Task size: 75.000000 +> [ 10.500000] (2:test_trace@Cpu B) Task prio: 3.000000 > [ 20.000000] (3:test_trace@Cpu B) Testing the trace integration cpu model: CpuTI > [ 20.000000] (3:test_trace@Cpu B) Task size: 120.000000 > [ 20.000000] (3:test_trace@Cpu B) Task prio: 4.000000 -> [ 30.000000] (1:test_trace@Cpu B) Test finished -> [ 30.000000] (2:test_trace@Cpu B) Test finished +> [ 24.000000] (1:test_trace@Cpu B) Test finished +> [ 30.400000] (2:test_trace@Cpu B) Test finished > [ 40.000000] (3:test_trace@Cpu B) Test finished p Testing trace integration using trace_B.txt and test-hbp1.0-hbp3.0-hbp4.0.xml, three process with different priority (included) @@ -195,12 +195,12 @@ $ ./trace_integration ${srcdir:=.}/../../../examples/platforms/two_hosts_platfor > [ 10.000000] (1:test_trace@Cpu B) Testing the trace integration cpu model: CpuTI > [ 10.000000] (1:test_trace@Cpu B) Task size: 25.000000 > [ 10.000000] (1:test_trace@Cpu B) Task prio: 1.000000 -> [ 10.000000] (2:test_trace@Cpu B) Testing the trace integration cpu model: CpuTI -> [ 10.000000] (2:test_trace@Cpu B) Task size: 75.000000 -> [ 10.000000] (2:test_trace@Cpu B) Task prio: 3.000000 +> [ 10.500000] (2:test_trace@Cpu B) Testing the trace integration cpu model: CpuTI +> [ 10.500000] (2:test_trace@Cpu B) Task size: 75.000000 +> [ 10.500000] (2:test_trace@Cpu B) Task prio: 3.000000 > [ 20.000000] (3:test_trace@Cpu B) Testing the trace integration cpu model: CpuTI > [ 20.000000] (3:test_trace@Cpu B) Task size: 120.000000 > [ 20.000000] (3:test_trace@Cpu B) Task prio: 4.000000 -> [ 30.000000] (1:test_trace@Cpu B) Test finished -> [ 30.000000] (2:test_trace@Cpu B) Test finished +> [ 24.000000] (1:test_trace@Cpu B) Test finished +> [ 30.400000] (2:test_trace@Cpu B) Test finished > [ 40.000000] (3:test_trace@Cpu B) Test finished -- 2.20.1