From 36656f47c5f26656f853c0e9e1c6285b5a984fa3 Mon Sep 17 00:00:00 2001 From: Frederic Suter Date: Wed, 16 Mar 2016 22:51:02 +0100 Subject: [PATCH] deal with trace --- .gitignore | 2 +- teshsuite/msg/CMakeLists.txt | 14 ++++++++- teshsuite/msg/trace/CMakeLists.txt | 19 ------------ .../test-hbp1-c0s0-c0s1.xml | 0 .../test-hbp1-c0s0-c1s0.xml | 0 .../test-hbp1-c0s1-c0s2.xml | 0 .../test-hbp1-c0s1-c2s2.xml | 0 .../test-hbp1-c0s2-c1s0.xml | 0 .../test-hbp1-c0s2-c1s1.xml | 0 .../test-hbp1-c1s1-c1s2.xml | 0 .../test-hbp1-c1s1-c3s2.xml | 0 .../test-hbp1.0-hbp1.0-hbp1.0.xml | 0 .../test-hbp1.0-hbp3.0-hbp4.0.xml | 0 .../test-hbp1.5-hbp1.5.xml | 0 .../test-hbp2.5-hbp1.5.xml | 0 .../trace_integration.c} | 0 .../trace_integration.tesh} | 30 +++++++++---------- tools/cmake/DefinePackages.cmake | 1 - 18 files changed, 29 insertions(+), 37 deletions(-) delete mode 100644 teshsuite/msg/trace/CMakeLists.txt rename teshsuite/msg/{trace => trace_integration}/test-hbp1-c0s0-c0s1.xml (100%) rename teshsuite/msg/{trace => trace_integration}/test-hbp1-c0s0-c1s0.xml (100%) rename teshsuite/msg/{trace => trace_integration}/test-hbp1-c0s1-c0s2.xml (100%) rename teshsuite/msg/{trace => trace_integration}/test-hbp1-c0s1-c2s2.xml (100%) rename teshsuite/msg/{trace => trace_integration}/test-hbp1-c0s2-c1s0.xml (100%) rename teshsuite/msg/{trace => trace_integration}/test-hbp1-c0s2-c1s1.xml (100%) rename teshsuite/msg/{trace => trace_integration}/test-hbp1-c1s1-c1s2.xml (100%) rename teshsuite/msg/{trace => trace_integration}/test-hbp1-c1s1-c3s2.xml (100%) rename teshsuite/msg/{trace => trace_integration}/test-hbp1.0-hbp1.0-hbp1.0.xml (100%) rename teshsuite/msg/{trace => trace_integration}/test-hbp1.0-hbp3.0-hbp4.0.xml (100%) rename teshsuite/msg/{trace => trace_integration}/test-hbp1.5-hbp1.5.xml (100%) rename teshsuite/msg/{trace => trace_integration}/test-hbp2.5-hbp1.5.xml (100%) rename teshsuite/msg/{trace/test_trace_integration.c => trace_integration/trace_integration.c} (100%) rename teshsuite/msg/{trace/trace.tesh => trace_integration/trace_integration.tesh} (73%) diff --git a/.gitignore b/.gitignore index bdd918888a..db80aae4ac 100644 --- a/.gitignore +++ b/.gitignore @@ -276,7 +276,7 @@ teshsuite/msg/process_join/process_join teshsuite/msg/process/process teshsuite/msg/storage_client_server/storage_client_server teshsuite/msg/task_destroy_cancel/task_destroy_cancel -teshsuite/msg/trace/test_trace_integration +teshsuite/msg/trace_integration/trace_integration teshsuite/simdag/availability/availability teshsuite/simdag/basic/basic0 teshsuite/simdag/basic/basic1 diff --git a/teshsuite/msg/CMakeLists.txt b/teshsuite/msg/CMakeLists.txt index 2a4f2f1285..d1229d4131 100644 --- a/teshsuite/msg/CMakeLists.txt +++ b/teshsuite/msg/CMakeLists.txt @@ -1,5 +1,5 @@ foreach(x concurrent_rw get_sender host_on_off host_on_off_processes host_on_off_recv host_on_off_wait listen_async pid - process process_join storage_client_server task_destroy_cancel) + process process_join storage_client_server task_destroy_cancel trace_integration) add_executable (${x} ${x}/${x}.c) target_link_libraries(${x} simgrid) set_target_properties(${x} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${x}) @@ -12,3 +12,15 @@ endforeach() set(teshsuite_src ${teshsuite_src} PARENT_SCOPE) set(tesh_files ${tesh_files} PARENT_SCOPE) +set(xml_files ${xml_files} ${CMAKE_CURRENT_SOURCE_DIR}/trace_integration/test-hbp1.0-hbp1.0-hbp1.0.xml + ${CMAKE_CURRENT_SOURCE_DIR}/trace_integration/test-hbp1.0-hbp3.0-hbp4.0.xml + ${CMAKE_CURRENT_SOURCE_DIR}/trace_integration/test-hbp1.5-hbp1.5.xml + ${CMAKE_CURRENT_SOURCE_DIR}/trace_integration/test-hbp1-c0s0-c0s1.xml + ${CMAKE_CURRENT_SOURCE_DIR}/trace_integration/test-hbp1-c0s0-c1s0.xml + ${CMAKE_CURRENT_SOURCE_DIR}/trace_integration/test-hbp1-c0s1-c0s2.xml + ${CMAKE_CURRENT_SOURCE_DIR}/trace_integration/test-hbp1-c0s1-c2s2.xml + ${CMAKE_CURRENT_SOURCE_DIR}/trace_integration/test-hbp1-c0s2-c1s0.xml + ${CMAKE_CURRENT_SOURCE_DIR}/trace_integration/test-hbp1-c0s2-c1s1.xml + ${CMAKE_CURRENT_SOURCE_DIR}/trace_integration/test-hbp1-c1s1-c1s2.xml + ${CMAKE_CURRENT_SOURCE_DIR}/trace_integration/test-hbp1-c1s1-c3s2.xml + ${CMAKE_CURRENT_SOURCE_DIR}/trace_integration/test-hbp2.5-hbp1.5.xml PARENT_SCOPE) diff --git a/teshsuite/msg/trace/CMakeLists.txt b/teshsuite/msg/trace/CMakeLists.txt deleted file mode 100644 index f04058dabc..0000000000 --- a/teshsuite/msg/trace/CMakeLists.txt +++ /dev/null @@ -1,19 +0,0 @@ -add_executable (test_trace_integration test_trace_integration.c) -target_link_libraries(test_trace_integration simgrid) - -set(tesh_files ${tesh_files} ${CMAKE_CURRENT_SOURCE_DIR}/trace.tesh PARENT_SCOPE) -set(teshsuite_src ${teshsuite_src} ${CMAKE_CURRENT_SOURCE_DIR}/test_trace_integration.c PARENT_SCOPE) -set(xml_files ${xml_files} ${CMAKE_CURRENT_SOURCE_DIR}/test-hbp1.0-hbp1.0-hbp1.0.xml - ${CMAKE_CURRENT_SOURCE_DIR}/test-hbp1.0-hbp3.0-hbp4.0.xml - ${CMAKE_CURRENT_SOURCE_DIR}/test-hbp1.5-hbp1.5.xml - ${CMAKE_CURRENT_SOURCE_DIR}/test-hbp1-c0s0-c0s1.xml - ${CMAKE_CURRENT_SOURCE_DIR}/test-hbp1-c0s0-c1s0.xml - ${CMAKE_CURRENT_SOURCE_DIR}/test-hbp1-c0s1-c0s2.xml - ${CMAKE_CURRENT_SOURCE_DIR}/test-hbp1-c0s1-c2s2.xml - ${CMAKE_CURRENT_SOURCE_DIR}/test-hbp1-c0s2-c1s0.xml - ${CMAKE_CURRENT_SOURCE_DIR}/test-hbp1-c0s2-c1s1.xml - ${CMAKE_CURRENT_SOURCE_DIR}/test-hbp1-c1s1-c1s2.xml - ${CMAKE_CURRENT_SOURCE_DIR}/test-hbp1-c1s1-c3s2.xml - ${CMAKE_CURRENT_SOURCE_DIR}/test-hbp2.5-hbp1.5.xml PARENT_SCOPE) - -ADD_TESH_FACTORIES(tesh-msg-trace "thread;ucontext;raw" --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/msg/trace --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/msg/trace ${CMAKE_HOME_DIRECTORY}/teshsuite/msg/trace/trace.tesh) diff --git a/teshsuite/msg/trace/test-hbp1-c0s0-c0s1.xml b/teshsuite/msg/trace_integration/test-hbp1-c0s0-c0s1.xml similarity index 100% rename from teshsuite/msg/trace/test-hbp1-c0s0-c0s1.xml rename to teshsuite/msg/trace_integration/test-hbp1-c0s0-c0s1.xml diff --git a/teshsuite/msg/trace/test-hbp1-c0s0-c1s0.xml b/teshsuite/msg/trace_integration/test-hbp1-c0s0-c1s0.xml similarity index 100% rename from teshsuite/msg/trace/test-hbp1-c0s0-c1s0.xml rename to teshsuite/msg/trace_integration/test-hbp1-c0s0-c1s0.xml diff --git a/teshsuite/msg/trace/test-hbp1-c0s1-c0s2.xml b/teshsuite/msg/trace_integration/test-hbp1-c0s1-c0s2.xml similarity index 100% rename from teshsuite/msg/trace/test-hbp1-c0s1-c0s2.xml rename to teshsuite/msg/trace_integration/test-hbp1-c0s1-c0s2.xml diff --git a/teshsuite/msg/trace/test-hbp1-c0s1-c2s2.xml b/teshsuite/msg/trace_integration/test-hbp1-c0s1-c2s2.xml similarity index 100% rename from teshsuite/msg/trace/test-hbp1-c0s1-c2s2.xml rename to teshsuite/msg/trace_integration/test-hbp1-c0s1-c2s2.xml diff --git a/teshsuite/msg/trace/test-hbp1-c0s2-c1s0.xml b/teshsuite/msg/trace_integration/test-hbp1-c0s2-c1s0.xml similarity index 100% rename from teshsuite/msg/trace/test-hbp1-c0s2-c1s0.xml rename to teshsuite/msg/trace_integration/test-hbp1-c0s2-c1s0.xml diff --git a/teshsuite/msg/trace/test-hbp1-c0s2-c1s1.xml b/teshsuite/msg/trace_integration/test-hbp1-c0s2-c1s1.xml similarity index 100% rename from teshsuite/msg/trace/test-hbp1-c0s2-c1s1.xml rename to teshsuite/msg/trace_integration/test-hbp1-c0s2-c1s1.xml diff --git a/teshsuite/msg/trace/test-hbp1-c1s1-c1s2.xml b/teshsuite/msg/trace_integration/test-hbp1-c1s1-c1s2.xml similarity index 100% rename from teshsuite/msg/trace/test-hbp1-c1s1-c1s2.xml rename to teshsuite/msg/trace_integration/test-hbp1-c1s1-c1s2.xml diff --git a/teshsuite/msg/trace/test-hbp1-c1s1-c3s2.xml b/teshsuite/msg/trace_integration/test-hbp1-c1s1-c3s2.xml similarity index 100% rename from teshsuite/msg/trace/test-hbp1-c1s1-c3s2.xml rename to teshsuite/msg/trace_integration/test-hbp1-c1s1-c3s2.xml diff --git a/teshsuite/msg/trace/test-hbp1.0-hbp1.0-hbp1.0.xml b/teshsuite/msg/trace_integration/test-hbp1.0-hbp1.0-hbp1.0.xml similarity index 100% rename from teshsuite/msg/trace/test-hbp1.0-hbp1.0-hbp1.0.xml rename to teshsuite/msg/trace_integration/test-hbp1.0-hbp1.0-hbp1.0.xml diff --git a/teshsuite/msg/trace/test-hbp1.0-hbp3.0-hbp4.0.xml b/teshsuite/msg/trace_integration/test-hbp1.0-hbp3.0-hbp4.0.xml similarity index 100% rename from teshsuite/msg/trace/test-hbp1.0-hbp3.0-hbp4.0.xml rename to teshsuite/msg/trace_integration/test-hbp1.0-hbp3.0-hbp4.0.xml diff --git a/teshsuite/msg/trace/test-hbp1.5-hbp1.5.xml b/teshsuite/msg/trace_integration/test-hbp1.5-hbp1.5.xml similarity index 100% rename from teshsuite/msg/trace/test-hbp1.5-hbp1.5.xml rename to teshsuite/msg/trace_integration/test-hbp1.5-hbp1.5.xml diff --git a/teshsuite/msg/trace/test-hbp2.5-hbp1.5.xml b/teshsuite/msg/trace_integration/test-hbp2.5-hbp1.5.xml similarity index 100% rename from teshsuite/msg/trace/test-hbp2.5-hbp1.5.xml rename to teshsuite/msg/trace_integration/test-hbp2.5-hbp1.5.xml diff --git a/teshsuite/msg/trace/test_trace_integration.c b/teshsuite/msg/trace_integration/trace_integration.c similarity index 100% rename from teshsuite/msg/trace/test_trace_integration.c rename to teshsuite/msg/trace_integration/trace_integration.c diff --git a/teshsuite/msg/trace/trace.tesh b/teshsuite/msg/trace_integration/trace_integration.tesh similarity index 73% rename from teshsuite/msg/trace/trace.tesh rename to teshsuite/msg/trace_integration/trace_integration.tesh index 657da7e2ce..3ba862de5b 100644 --- a/teshsuite/msg/trace/trace.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 -$ $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" +$ ./trace_integration ${srcdir:=.}/../../../examples/platforms/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 @@ $ $SG_TEST_EXENV ${bindir:=.}/test_trace_integration$EXEEXT ../../../examples/pl 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" +$ ./trace_integration ${srcdir:=.}/../../../examples/platforms/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 @@ $ $SG_TEST_EXENV ${bindir:=.}/test_trace_integration$EXEEXT ../../../examples/pl 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" +$ ./trace_integration ${srcdir:=.}/../../../examples/platforms/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 @@ $ $SG_TEST_EXENV ${bindir:=.}/test_trace_integration$EXEEXT ../../../examples/pl 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 -$ $SG_TEST_EXENV ${bindir:=.}/test_trace_integration$EXEEXT ../../../examples/platforms/two_hosts_platform_with_availability.xml ./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" +$ ./trace_integration ${srcdir:=.}/../../../examples/platforms/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 @@ $ $SG_TEST_EXENV ${bindir:=.}/test_trace_integration$EXEEXT ../../../examples/pl 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 -$ $SG_TEST_EXENV ${bindir:=.}/test_trace_integration$EXEEXT ../../../examples/platforms/two_hosts_platform_with_availability.xml ./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" +$ ./trace_integration ${srcdir:=.}/../../../examples/platforms/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 @@ $ $SG_TEST_EXENV ${bindir:=.}/test_trace_integration$EXEEXT ../../../examples/pl 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 -$ $SG_TEST_EXENV ${bindir:=.}/test_trace_integration$EXEEXT ../../../examples/platforms/two_hosts_platform_with_availability.xml ./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" +$ ./trace_integration ${srcdir:=.}/../../../examples/platforms/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 @@ $ $SG_TEST_EXENV ${bindir:=.}/test_trace_integration$EXEEXT ../../../examples/pl 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 -$ $SG_TEST_EXENV ${bindir:=.}/test_trace_integration$EXEEXT ../../../examples/platforms/two_hosts_platform_with_availability.xml ./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" +$ ./trace_integration ${srcdir:=.}/../../../examples/platforms/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 @@ $ $SG_TEST_EXENV ${bindir:=.}/test_trace_integration$EXEEXT ../../../examples/pl 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 -$ $SG_TEST_EXENV ${bindir:=.}/test_trace_integration$EXEEXT ../../../examples/platforms/two_hosts_platform_with_availability.xml ./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" +$ ./trace_integration ${srcdir:=.}/../../../examples/platforms/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 @@ $ $SG_TEST_EXENV ${bindir:=.}/test_trace_integration$EXEEXT ../../../examples/pl p Testing trace integration using trace_B.txt and test-hbp1.5-hbp1.5.xml, two process with same priority ! output sort -$ $SG_TEST_EXENV ${bindir:=.}/test_trace_integration$EXEEXT ../../../examples/platforms/two_hosts_platform_with_availability.xml ./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" +$ ./trace_integration ${srcdir:=.}/../../../examples/platforms/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 @@ $ $SG_TEST_EXENV ${bindir:=.}/test_trace_integration$EXEEXT ../../../examples/pl p Testing trace integration using trace_B.txt and test-hbp2.5-hbp1.5.xml, two process with different priority ! output sort -$ $SG_TEST_EXENV ${bindir:=.}/test_trace_integration$EXEEXT ../../../examples/platforms/two_hosts_platform_with_availability.xml ./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" +$ ./trace_integration ${srcdir:=.}/../../../examples/platforms/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 @@ $ $SG_TEST_EXENV ${bindir:=.}/test_trace_integration$EXEEXT ../../../examples/pl p Testing trace integration using trace_B.txt and test-hbp2.5-hbp1.5.xml, two process with different priority ! output sort -$ $SG_TEST_EXENV ${bindir:=.}/test_trace_integration$EXEEXT ../../../examples/platforms/two_hosts_platform_with_availability.xml ./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" +$ ./trace_integration ${srcdir:=.}/../../../examples/platforms/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' @@ -148,7 +148,7 @@ $ $SG_TEST_EXENV ${bindir:=.}/test_trace_integration$EXEEXT ../../../examples/pl p Testing trace integration using trace_B.txt and test-hbp1.0-hbp1.0-hbp1.0.xml, three process with same priority ! output sort -$ $SG_TEST_EXENV ${bindir:=.}/test_trace_integration$EXEEXT ../../../examples/platforms/two_hosts_platform_with_availability.xml ./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" +$ ./trace_integration ${srcdir:=.}/../../../examples/platforms/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 @@ $ $SG_TEST_EXENV ${bindir:=.}/test_trace_integration$EXEEXT ../../../examples/pl p Testing trace integration using trace_B.txt and test-hbp1.0-hbp3.0-hbp4.0.xml, three process with same priority ! output sort -$ $SG_TEST_EXENV ${bindir:=.}/test_trace_integration$EXEEXT ../../../examples/platforms/two_hosts_platform_with_availability.xml ./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" +$ ./trace_integration ${srcdir:=.}/../../../examples/platforms/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 @@ $ $SG_TEST_EXENV ${bindir:=.}/test_trace_integration$EXEEXT ../../../examples/pl p Testing trace integration using trace_B.txt and test-hbp1.0-hbp3.0-hbp4.0.xml, three process with different priority ! output sort -$ $SG_TEST_EXENV ${bindir:=.}/test_trace_integration$EXEEXT ../../../examples/platforms/two_hosts_platform_with_availability.xml ./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" +$ ./trace_integration ${srcdir:=.}/../../../examples/platforms/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' @@ -208,7 +208,7 @@ $ $SG_TEST_EXENV ${bindir:=.}/test_trace_integration$EXEEXT ../../../examples/pl 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 -$ $SG_TEST_EXENV ${bindir:=.}/test_trace_integration$EXEEXT ../../../examples/platforms/two_hosts_platform_with_availability_included.xml ./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" +$ ./trace_integration ${srcdir:=.}/../../../examples/platforms/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' diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake index 3ddc2afda8..f97e0b5da6 100644 --- a/tools/cmake/DefinePackages.cmake +++ b/tools/cmake/DefinePackages.cmake @@ -995,7 +995,6 @@ set(CMAKEFILES_TXT teshsuite/mc/replay/CMakeLists.txt teshsuite/msg/CMakeLists.txt - teshsuite/msg/trace/CMakeLists.txt teshsuite/simdag/CMakeLists.txt teshsuite/simdag/basic/CMakeLists.txt -- 2.20.1