From 45783c8b51b99aca165b6fd1c941c47e0af8f08e Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Sun, 3 Dec 2017 20:27:09 +0100 Subject: [PATCH] really fix out of tree builds --- teshsuite/msg/get_sender/get_sender.tesh | 2 +- teshsuite/msg/host_on_off/host_on_off.tesh | 2 +- .../host_on_off_processes.tesh | 12 ++++---- .../host_on_off_recv/host_on_off_recv.tesh | 2 +- .../msg/io-raw-storage/io-raw-storage.tesh | 2 +- .../task_destroy_cancel.tesh | 2 +- .../task_listen_from/task_listen_from.tesh | 2 +- .../msg/task_progress/task_progress.tesh | 2 +- .../trace_integration/trace_integration.tesh | 28 +++++++++---------- 9 files changed, 27 insertions(+), 27 deletions(-) diff --git a/teshsuite/msg/get_sender/get_sender.tesh b/teshsuite/msg/get_sender/get_sender.tesh index 4427c441f6..ca9ced09ca 100644 --- a/teshsuite/msg/get_sender/get_sender.tesh +++ b/teshsuite/msg/get_sender/get_sender.tesh @@ -1,5 +1,5 @@ ! output sort -$ ./get_sender ${platfdir}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir}/get_sender ${platfdir}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (1:send@Tremblay) Sending > [ 0.000000] (2:receive@Tremblay) Receiving > [ 0.000195] (2:receive@Tremblay) Got a message sent by 'send' diff --git a/teshsuite/msg/host_on_off/host_on_off.tesh b/teshsuite/msg/host_on_off/host_on_off.tesh index 633fdf814a..64210eec7f 100644 --- a/teshsuite/msg/host_on_off/host_on_off.tesh +++ b/teshsuite/msg/host_on_off/host_on_off.tesh @@ -1,5 +1,5 @@ -$ ./host_on_off ${platfdir}/small_platform.xml +$ ${bindir}/host_on_off ${platfdir}/small_platform.xml > [Tremblay:master:(1) 0.000000] [msg_test/INFO] Sending "task on" > [Jupiter:slave:(2) 0.824497] [msg_test/INFO] Task "task on" done > [Tremblay:master:(1) 1.169155] [msg_test/INFO] Sending "task off" diff --git a/teshsuite/msg/host_on_off_processes/host_on_off_processes.tesh b/teshsuite/msg/host_on_off_processes/host_on_off_processes.tesh index 763d9b6342..e3e9bc5d0c 100644 --- a/teshsuite/msg/host_on_off_processes/host_on_off_processes.tesh +++ b/teshsuite/msg/host_on_off_processes/host_on_off_processes.tesh @@ -1,5 +1,5 @@ -$ ./host_on_off_processes ${platfdir}/small_platform.xml 1 --log=no_loc +$ ${bindir}/host_on_off_processes ${platfdir}/small_platform.xml 1 --log=no_loc > [Tremblay:test_launcher:(1) 0.000000] [msg_test/INFO] Test 1: > [Tremblay:test_launcher:(1) 0.000000] [msg_test/INFO] Create a process on Jupiter > [Jupiter:process_daemon:(2) 0.000000] [msg_test/INFO] Start daemon on Jupiter (76296000.000000) @@ -12,7 +12,7 @@ $ ./host_on_off_processes ${platfdir}/small_platform.xml 1 --log=no_loc > [Tremblay:test_launcher:(1) 13.000000] [msg_test/INFO] Test done. See you! > [13.000000] [msg_test/INFO] Simulation time 13 -$ ./host_on_off_processes ${platfdir}/small_platform.xml 2 --log=no_loc +$ ${bindir}/host_on_off_processes ${platfdir}/small_platform.xml 2 --log=no_loc > [Tremblay:test_launcher:(1) 0.000000] [msg_test/INFO] Test 2: > [Tremblay:test_launcher:(1) 0.000000] [msg_test/INFO] Turn off Jupiter > [0.000000] [simix_process/WARNING] Cannot launch process 'process_daemon' on failed host 'Jupiter' @@ -24,7 +24,7 @@ $ ./host_on_off_processes ${platfdir}/small_platform.xml 2 --log=no_loc > [Tremblay:test_launcher:(1) 20.000000] [msg_test/INFO] Test done. See you! > [20.000000] [msg_test/INFO] Simulation time 20 -$ ./host_on_off_processes ${platfdir}/small_platform.xml 3 --log=no_loc +$ ${bindir}/host_on_off_processes ${platfdir}/small_platform.xml 3 --log=no_loc > [Tremblay:test_launcher:(1) 0.000000] [msg_test/INFO] Test 3: > [Jupiter:process_sleep:(2) 0.000000] [msg_test/INFO] I'm alive but I should sleep > [Jupiter:process_sleep:(2) 10.000000] [msg_test/INFO] I'm alive but I should sleep @@ -43,7 +43,7 @@ $ ./host_on_off_processes ${platfdir}/small_platform.xml 3 --log=no_loc > [Tremblay:test_launcher:(1) 10100.000000] [msg_test/INFO] Test done. See you! > [10100.000000] [msg_test/INFO] Simulation time 10100 -$ ./host_on_off_processes ${platfdir}/small_platform.xml 4 --log=no_loc +$ ${bindir}/host_on_off_processes ${platfdir}/small_platform.xml 4 --log=no_loc > [Tremblay:test_launcher:(1) 0.000000] [msg_test/INFO] Test 4 (turn off src during a communication) : Create a Process/task to make a communication between Jupiter and Tremblay and turn off Jupiter during the communication > [Tremblay:commRX:(2) 10.000000] [msg_test/INFO] Start RX > [Jupiter:commTX:(3) 10.000000] [msg_test/INFO] Start TX @@ -55,7 +55,7 @@ $ ./host_on_off_processes ${platfdir}/small_platform.xml 4 --log=no_loc > [Tremblay:commRX:(2) 20.000000] [msg_test/INFO] RX Done > [20.000000] [msg_test/INFO] Simulation time 20 -$ ./host_on_off_processes ${platfdir}/small_platform.xml 5 --log=no_loc +$ ${bindir}/host_on_off_processes ${platfdir}/small_platform.xml 5 --log=no_loc > [Tremblay:test_launcher:(1) 0.000000] [msg_test/INFO] Test 5 (turn off dest during a communication : Create a Process/task to make a communication between Tremblay and Jupiter and turn off Jupiter during the communication > [Jupiter:commRX:(2) 10.000000] [msg_test/INFO] Start RX > [Tremblay:commTX:(3) 10.000000] [msg_test/INFO] Start TX @@ -66,7 +66,7 @@ $ ./host_on_off_processes ${platfdir}/small_platform.xml 5 --log=no_loc > [Tremblay:commTX:(3) 40.000000] [msg_test/INFO] TX done > [40.000000] [msg_test/INFO] Simulation time 40 -$ ./host_on_off_processes ${platfdir}/small_platform.xml 6 --log=no_loc +$ ${bindir}/host_on_off_processes ${platfdir}/small_platform.xml 6 --log=no_loc > [Tremblay:test_launcher:(1) 0.000000] [msg_test/INFO] Test 6: Turn on Jupiter, assign a VM on Jupiter, launch a process inside the VM, and turn off the node > [vm0:process_daemon:(2) 0.000000] [msg_test/INFO] Start daemon on vm0 (76296000.000000) > [vm0:process_daemon:(2) 0.000000] [msg_test/INFO] Execute daemon diff --git a/teshsuite/msg/host_on_off_recv/host_on_off_recv.tesh b/teshsuite/msg/host_on_off_recv/host_on_off_recv.tesh index b5959808e0..d4baec95d8 100644 --- a/teshsuite/msg/host_on_off_recv/host_on_off_recv.tesh +++ b/teshsuite/msg/host_on_off_recv/host_on_off_recv.tesh @@ -1,4 +1,4 @@ -$ ./host_on_off_recv ${platfdir}/small_platform.xml +$ ${bindir}/host_on_off_recv ${platfdir}/small_platform.xml > [Tremblay:master:(1) 0.000000] [msg_test/INFO] Master starting > [Jupiter:slave:(2) 0.000000] [msg_test/INFO] Slave receiving > [Tremblay:master:(1) 1.000000] [msg_test/INFO] Turning off the slave host diff --git a/teshsuite/msg/io-raw-storage/io-raw-storage.tesh b/teshsuite/msg/io-raw-storage/io-raw-storage.tesh index 52e2412e5b..893abf6937 100644 --- a/teshsuite/msg/io-raw-storage/io-raw-storage.tesh +++ b/teshsuite/msg/io-raw-storage/io-raw-storage.tesh @@ -1,6 +1,6 @@ #! ./tesh -$ ./io-raw-storage$EXEEXT ${platfdir}/storage/storage.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ ${bindir}/io-raw-storage$EXEEXT ${platfdir}/storage/storage.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (1:@denise) *** Storage info on denise *** > [ 0.000000] (1:@denise) Storage name: Disk2, mount name: c: > [ 0.000000] (1:@denise) Storage name: Disk4, mount name: /home diff --git a/teshsuite/msg/task_destroy_cancel/task_destroy_cancel.tesh b/teshsuite/msg/task_destroy_cancel/task_destroy_cancel.tesh index 51c99c2bcd..a0f67f753d 100644 --- a/teshsuite/msg/task_destroy_cancel/task_destroy_cancel.tesh +++ b/teshsuite/msg/task_destroy_cancel/task_destroy_cancel.tesh @@ -1,4 +1,4 @@ -$ ./task_destroy_cancel ${platfdir}/small_platform.xml +$ ${bindir}/task_destroy_cancel ${platfdir}/small_platform.xml > [Tremblay:master:(1) 0.000000] [msg_test/INFO] Sending task: "normal" > [Jupiter:worker:(2) 0.169155] [msg_test/INFO] Handling task "normal" > [Tremblay:master:(1) 0.169155] [msg_test/INFO] Canceling task "cancel directly" directly diff --git a/teshsuite/msg/task_listen_from/task_listen_from.tesh b/teshsuite/msg/task_listen_from/task_listen_from.tesh index 268065999f..6033f4035c 100644 --- a/teshsuite/msg/task_listen_from/task_listen_from.tesh +++ b/teshsuite/msg/task_listen_from/task_listen_from.tesh @@ -1,3 +1,3 @@ -$ ./task_listen_from ${platfdir}/small_platform.xml +$ ${bindir}/task_listen_from ${platfdir}/small_platform.xml > [Tremblay:tester:(1) 0.000000] [msg_test/INFO] MSG_task_listen_from returns() 1 (should return my pid, which is 1) > [Tremblay:tester:(1) 0.000000] [msg_test/INFO] MSG_task_listen returns() 1 (should return true, i.e. 1) diff --git a/teshsuite/msg/task_progress/task_progress.tesh b/teshsuite/msg/task_progress/task_progress.tesh index 603a4a403e..1ef358b0ea 100644 --- a/teshsuite/msg/task_progress/task_progress.tesh +++ b/teshsuite/msg/task_progress/task_progress.tesh @@ -1,4 +1,4 @@ -$ ./task_progress ${platfdir}/small_platform.xml +$ ${bindir}/task_progress ${platfdir}/small_platform.xml > [0.000000] [xbt_cfg/INFO] Switching to the L07 model to handle parallel tasks. > [Tremblay:sequential:(1) 0.000000] [msg_test/INFO] get the progress of simple before the task starts > [Tremblay:sequential:(1) 0.000000] [msg_test/INFO] Executing task: "simple" diff --git a/teshsuite/msg/trace_integration/trace_integration.tesh b/teshsuite/msg/trace_integration/trace_integration.tesh index 23a6f8d6b3..d3b9e30bee 100644 --- a/teshsuite/msg/trace_integration/trace_integration.tesh +++ b/teshsuite/msg/trace_integration/trace_integration.tesh @@ -4,7 +4,7 @@ p c=cycle s=step p=priority h=host p Testing trace integration using trace_B.txt and test-hbp1-c0s0-c0s1.xml, test_trace:start == trace_cycle_0_step_0, test_trace:end < trace_cycle_0_step_1 ! output sort -$ ./trace_integration ${platfdir}/two_hosts_platform_with_availability.xml ${srcdir:=.}/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" +$ ${bindir}/trace_integration ${platfdir}/two_hosts_platform_with_availability.xml ${srcdir:=.}/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' @@ -16,7 +16,7 @@ $ ./trace_integration ${platfdir}/two_hosts_platform_with_availability.xml ${sr 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 -$ ./trace_integration ${platfdir}/two_hosts_platform_with_availability.xml ${srcdir:=.}/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" +$ ${bindir}/trace_integration ${platfdir}/two_hosts_platform_with_availability.xml ${srcdir:=.}/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' @@ -28,7 +28,7 @@ $ ./trace_integration ${platfdir}/two_hosts_platform_with_availability.xml ${sr 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 -$ ./trace_integration ${platfdir}/two_hosts_platform_with_availability.xml ${srcdir:=.}/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" +$ ${bindir}/trace_integration ${platfdir}/two_hosts_platform_with_availability.xml ${srcdir:=.}/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' @@ -40,7 +40,7 @@ $ ./trace_integration ${platfdir}/two_hosts_platform_with_availability.xml ${sr 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 ! output sort -$ ./trace_integration ${platfdir}/two_hosts_platform_with_availability.xml ${srcdir:=.}/test-hbp1-c0s0-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" +$ ${bindir}/trace_integration ${platfdir}/two_hosts_platform_with_availability.xml ${srcdir:=.}/test-hbp1-c0s0-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' @@ -52,7 +52,7 @@ $ ./trace_integration ${platfdir}/two_hosts_platform_with_availability.xml ${sr p Testing trace integration using trace_B.txt and test-hbp1-c0s2-c1s1.xml, test_trace:start == trace_cycle_0_step_2, test_trace:end < trace_cycle_1_step_1 ! output sort -$ ./trace_integration ${platfdir}/two_hosts_platform_with_availability.xml ${srcdir:=.}/test-hbp1-c0s2-c1s1.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" +$ ${bindir}/trace_integration ${platfdir}/two_hosts_platform_with_availability.xml ${srcdir:=.}/test-hbp1-c0s2-c1s1.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' @@ -64,7 +64,7 @@ $ ./trace_integration ${platfdir}/two_hosts_platform_with_availability.xml ${sr p Testing trace integration using trace_B.txt and test-hbp1-c0s1-c2s2.xml, test_trace:start == trace_cycle_0_step_1, test_trace:end < trace_cycle_2_step_2 ! output sort -$ ./trace_integration ${platfdir}/two_hosts_platform_with_availability.xml ${srcdir:=.}/test-hbp1-c0s1-c2s2.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" +$ ${bindir}/trace_integration ${platfdir}/two_hosts_platform_with_availability.xml ${srcdir:=.}/test-hbp1-c0s1-c2s2.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' @@ -76,7 +76,7 @@ $ ./trace_integration ${platfdir}/two_hosts_platform_with_availability.xml ${sr p Testing trace integration using trace_B.txt and test-hbp1-c1s1-c1s2.xml, test_trace:start == trace_cycle_1_step_1, test_trace:end < trace_cycle_1_step_2 ! output sort -$ ./trace_integration ${platfdir}/two_hosts_platform_with_availability.xml ${srcdir:=.}/test-hbp1-c1s1-c1s2.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" +$ ${bindir}/trace_integration ${platfdir}/two_hosts_platform_with_availability.xml ${srcdir:=.}/test-hbp1-c1s1-c1s2.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' @@ -88,7 +88,7 @@ $ ./trace_integration ${platfdir}/two_hosts_platform_with_availability.xml ${sr p Testing trace integration using trace_B.txt and test-hbp1-c1s1-c3s2.xml, test_trace:start == trace_cycle_1_step_1, test_trace:end < trace_cycle_3_step_2 ! output sort -$ ./trace_integration ${platfdir}/two_hosts_platform_with_availability.xml ${srcdir:=.}/test-hbp1-c1s1-c3s2.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" +$ ${bindir}/trace_integration ${platfdir}/two_hosts_platform_with_availability.xml ${srcdir:=.}/test-hbp1-c1s1-c3s2.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' @@ -100,7 +100,7 @@ $ ./trace_integration ${platfdir}/two_hosts_platform_with_availability.xml ${sr p Testing trace integration using trace_B.txt and test-hbp1.5-hbp1.5.xml, two process with same priority ! output sort -$ ./trace_integration ${platfdir}/two_hosts_platform_with_availability.xml ${srcdir:=.}/test-hbp1.5-hbp1.5.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" +$ ${bindir}/trace_integration ${platfdir}/two_hosts_platform_with_availability.xml ${srcdir:=.}/test-hbp1.5-hbp1.5.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' @@ -116,7 +116,7 @@ $ ./trace_integration ${platfdir}/two_hosts_platform_with_availability.xml ${sr p Testing trace integration using trace_B.txt and test-hbp2.5-hbp1.5.xml, two process with different priority ! output sort -$ ./trace_integration ${platfdir}/two_hosts_platform_with_availability.xml ${srcdir:=.}/test-hbp2.5-hbp1.5.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" +$ ${bindir}/trace_integration ${platfdir}/two_hosts_platform_with_availability.xml ${srcdir:=.}/test-hbp2.5-hbp1.5.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' @@ -132,7 +132,7 @@ $ ./trace_integration ${platfdir}/two_hosts_platform_with_availability.xml ${sr p Testing trace integration using trace_B.txt and test-hbp2.5-hbp1.5.xml, two process with different priority (included) ! output sort -$ ./trace_integration ${platfdir}/two_hosts_platform_with_availability_included.xml ${srcdir:=.}/test-hbp2.5-hbp1.5.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" +$ ${bindir}/trace_integration ${platfdir}/two_hosts_platform_with_availability_included.xml ${srcdir:=.}/test-hbp2.5-hbp1.5.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' @@ -148,7 +148,7 @@ $ ./trace_integration ${platfdir}/two_hosts_platform_with_availability_included. p Testing trace integration using trace_B.txt and test-hbp1.0-hbp1.0-hbp1.0.xml, three process with same priority ! output sort -$ ./trace_integration ${platfdir}/two_hosts_platform_with_availability.xml ${srcdir:=.}/test-hbp1.0-hbp1.0-hbp1.0.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" +$ ${bindir}/trace_integration ${platfdir}/two_hosts_platform_with_availability.xml ${srcdir:=.}/test-hbp1.0-hbp1.0-hbp1.0.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' @@ -168,7 +168,7 @@ $ ./trace_integration ${platfdir}/two_hosts_platform_with_availability.xml ${sr p Testing trace integration using trace_B.txt and test-hbp1.0-hbp3.0-hbp4.0.xml, three process with different priority ! output sort -$ ./trace_integration ${platfdir}/two_hosts_platform_with_availability.xml ${srcdir:=.}/test-hbp1.0-hbp3.0-hbp4.0.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" +$ ${bindir}/trace_integration ${platfdir}/two_hosts_platform_with_availability.xml ${srcdir:=.}/test-hbp1.0-hbp3.0-hbp4.0.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' @@ -188,7 +188,7 @@ $ ./trace_integration ${platfdir}/two_hosts_platform_with_availability.xml ${sr p Testing trace integration using trace_B.txt and test-hbp1.0-hbp3.0-hbp4.0.xml, three process with different priority (included) ! output sort -$ ./trace_integration ${platfdir}/two_hosts_platform_with_availability_included.xml ${srcdir:=.}/test-hbp1.0-hbp3.0-hbp4.0.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" +$ ${bindir}/trace_integration ${platfdir}/two_hosts_platform_with_availability_included.xml ${srcdir:=.}/test-hbp1.0-hbp3.0-hbp4.0.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' -- 2.20.1