-$ $SG_TEST_EXENV ${bindir:=.}/trace/test_trace_integration$EXEEXT ./trace/test1.xml --cfg=workstation/model:compound --cfg=network/model:CM02 --cfg=cpu/optim:TI "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
-> [ 0.000000] (0:@) Configuration change: Set 'workstation/model' to 'compound'
-> [ 0.000000] (0:@) Configuration change: Set 'network/model' to 'CM02'
-> [ 0.000000] (0:@) Configuration change: Set 'cpu/optim' to 'TI'
-> [ 0.000000] (0:@) Ignoring redefinition of trace trace/file.trace
-> [ 10.000000] (1:test_trace@CPU1) Testing the trace integration cpu model: CpuTI
-> [ 10.000000] (1:test_trace@CPU1) Task size: 400.000000
-> [ 10.000000] (1:test_trace@CPU1) Task prio: 1.000000
-> [ 40.000000] (1:test_trace@CPU1) Test finished
-
-p Testing trace integration using file.trace and test2.xml, a < max(time), max(time) < b < 2 max(time)
+$ $SG_TEST_EXENV ${bindir:=.}/test_trace_integration$EXEEXT ../../../examples/platforms/two_hosts_platform_with_availability.xml ./test-hbp1-c0s0-c0s1.xml --cfg=host/model:compound --cfg=network/model:CM02 --cfg=cpu/optim:TI --log=simix.thresh:warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+> [ 0.000000] (0:maestro@) Configuration change: Set 'host/model' to 'compound'
+> [ 0.000000] (0:maestro@) Configuration change: Set 'network/model' to 'CM02'
+> [ 0.000000] (0:maestro@) Configuration change: Set 'cpu/optim' to 'TI'
+> [ 0.000000] (1:test_trace@Cpu B) Testing the trace integration cpu model: CpuTI
+> [ 0.000000] (1:test_trace@Cpu B) Task size: 40.000000
+> [ 0.000000] (1:test_trace@Cpu B) Task prio: 1.000000
+> [ 4.000000] (1:test_trace@Cpu B) Test finished
+
+p Testing trace integration using trace_B.txt and test-hbp1-c0s1-c0s2.xml, test_trace:start == trace_cycle_0_step_1, test_trace:end < trace_cycle_0_step_2
+
+! output sort
+$ $SG_TEST_EXENV ${bindir:=.}/test_trace_integration$EXEEXT ../../../examples/platforms/two_hosts_platform_with_availability.xml ./test-hbp1-c0s1-c0s2.xml --cfg=host/model:compound --cfg=network/model:CM02 --cfg=cpu/optim:TI --log=simix.thresh:warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+> [ 0.000000] (0:maestro@) Configuration change: Set 'host/model' to 'compound'
+> [ 0.000000] (0:maestro@) Configuration change: Set 'network/model' to 'CM02'
+> [ 0.000000] (0:maestro@) Configuration change: Set 'cpu/optim' to 'TI'
+> [ 10.000000] (1:test_trace@Cpu B) Testing the trace integration cpu model: CpuTI
+> [ 10.000000] (1:test_trace@Cpu B) Task size: 40.000000
+> [ 10.000000] (1:test_trace@Cpu B) Task prio: 1.000000
+> [ 15.000000] (1:test_trace@Cpu B) Test finished
+
+p Testing trace integration using trace_B.txt and test-hbp1-c0s2-c1s0.xml, test_trace:start == trace_cycle_0_step_2, test_trace:end < trace_cycle_1_step_0
+
+! output sort
+$ $SG_TEST_EXENV ${bindir:=.}/test_trace_integration$EXEEXT ../../../examples/platforms/two_hosts_platform_with_availability.xml ./test-hbp1-c0s2-c1s0.xml --cfg=host/model:compound --cfg=network/model:CM02 --cfg=cpu/optim:TI --log=simix.thresh:warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+> [ 0.000000] (0:maestro@) Configuration change: Set 'host/model' to 'compound'
+> [ 0.000000] (0:maestro@) Configuration change: Set 'network/model' to 'CM02'
+> [ 0.000000] (0:maestro@) Configuration change: Set 'cpu/optim' to 'TI'
+> [ 20.000000] (1:test_trace@Cpu B) Testing the trace integration cpu model: CpuTI
+> [ 20.000000] (1:test_trace@Cpu B) Task size: 40.000000
+> [ 20.000000] (1:test_trace@Cpu B) Task prio: 1.000000
+> [ 30.000000] (1:test_trace@Cpu B) Test finished
+
+p Testing trace integration using trace_B.txt and test-hbp1-c0s0-c1s0.xml, test_trace:start == trace_cycle_0_step_0, test_trace:end < trace_cycle_1_step_0