From: Martin Quinson Date: Thu, 23 Dec 2021 15:40:16 +0000 (+0100) Subject: s/_/-/ X-Git-Tag: v3.30~191 X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/1e12fce8e66e07df47f8ed239da45ffbbaee2a53 s/_/-/ --- diff --git a/MANIFEST.in b/MANIFEST.in index 39c231346a..c0d0687c2b 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -207,8 +207,8 @@ include examples/cpp/dag-comm/s4u-dag-comm.tesh include examples/cpp/dag-failure/s4u-dag-failure.cpp include examples/cpp/dag-failure/s4u-dag-failure.tesh include examples/cpp/dag-from-dot/dag.dot -include examples/cpp/dag-from-dot/s4u_dag-from-dot.cpp -include examples/cpp/dag-from-dot/s4u_dag-from-dot.tesh +include examples/cpp/dag-from-dot/s4u-dag-from-dot.cpp +include examples/cpp/dag-from-dot/s4u-dag-from-dot.tesh include examples/cpp/dag-io/s4u-dag-io.cpp include examples/cpp/dag-io/s4u-dag-io.tesh include examples/cpp/dag-simple/s4u-dag-simple.cpp diff --git a/examples/cpp/CMakeLists.txt b/examples/cpp/CMakeLists.txt index 19f3cc5fa0..5ef1784903 100644 --- a/examples/cpp/CMakeLists.txt +++ b/examples/cpp/CMakeLists.txt @@ -29,18 +29,18 @@ foreach (example ${MC_regular_tests}) endforeach() if(HAVE_GRAPHVIZ) - add_executable (s4u_dag-from-dot EXCLUDE_FROM_ALL dag-from-dot/s4u_dag-from-dot.cpp) - target_link_libraries(s4u_dag-from-dot simgrid) - set_target_properties(s4u_dag-from-dot PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/dag-from-dot) - add_dependencies(tests s4u_dag-from-dot) + add_executable (s4u-dag-from-dot EXCLUDE_FROM_ALL dag-from-dot/s4u-dag-from-dot.cpp) + target_link_libraries(s4u-dag-from-dot simgrid) + set_target_properties(s4u-dag-from-dot PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/dag-from-dot) + add_dependencies(tests s4u-dag-from-dot) ADD_TESH(s4u-dag-from-dot --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/cpp/dag-from-dot --setenv platfdir=${CMAKE_HOME_DIRECTORY}/examples/platforms --cd ${CMAKE_BINARY_DIR}/examples/cpp/dag-from-dot - ${CMAKE_HOME_DIRECTORY}/examples/cpp/dag-from-dot/s4u_dag-from-dot.tesh) + ${CMAKE_HOME_DIRECTORY}/examples/cpp/dag-from-dot/s4u-dag-from-dot.tesh) endif() - set(examples_src ${examples_src} ${CMAKE_CURRENT_SOURCE_DIR}/dag-from-dot/s4u_dag-from-dot.cpp) - set(tesh_files ${tesh_files} ${CMAKE_CURRENT_SOURCE_DIR}/dag-from-dot/s4u_dag-from-dot.tesh) + set(examples_src ${examples_src} ${CMAKE_CURRENT_SOURCE_DIR}/dag-from-dot/s4u-dag-from-dot.cpp) + set(tesh_files ${tesh_files} ${CMAKE_CURRENT_SOURCE_DIR}/dag-from-dot/s4u-dag-from-dot.tesh) if(SIMGRID_HAVE_MC) diff --git a/examples/cpp/dag-from-dot/s4u_dag-from-dot.cpp b/examples/cpp/dag-from-dot/s4u-dag-from-dot.cpp similarity index 100% rename from examples/cpp/dag-from-dot/s4u_dag-from-dot.cpp rename to examples/cpp/dag-from-dot/s4u-dag-from-dot.cpp diff --git a/examples/cpp/dag-from-dot/s4u_dag-from-dot.tesh b/examples/cpp/dag-from-dot/s4u-dag-from-dot.tesh similarity index 98% rename from examples/cpp/dag-from-dot/s4u_dag-from-dot.tesh rename to examples/cpp/dag-from-dot/s4u-dag-from-dot.tesh index 190597ec66..b53237e03e 100644 --- a/examples/cpp/dag-from-dot/s4u_dag-from-dot.tesh +++ b/examples/cpp/dag-from-dot/s4u-dag-from-dot.tesh @@ -1,6 +1,6 @@ #!/usr/bin/env tesh -$ ${bindir:=.}/s4u_dag-from-dot --log=no_loc ${platfdir}/cluster_backbone.xml ${srcdir:=.}/dag.dot +$ ${bindir:=.}/s4u-dag-from-dot --log=no_loc ${platfdir}/cluster_backbone.xml ${srcdir:=.}/dag.dot > [0.000000] [dag_from_dot/INFO] --------- Display all activities of the loaded DAG ----------- > [0.000000] [dag_from_dot/INFO] 'root' is an Exec: 0 flops to execute. Dependencies: solved; Ressources: NOT assigned > [0.000000] [dag_from_dot/INFO] '0' is an Exec: 10000000129 flops to execute. Dependencies: NOT solved; Ressources: NOT assigned