From: Frederic Suter Date: Sat, 26 Mar 2016 16:16:38 +0000 (+0100) Subject: fix distcheck X-Git-Tag: v3_13~270^2 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/05b4f9bba0c7d503028b9db7624d4fbef50b5b41?hp=92c0f1f93abd31aabba2b867265ee78d0fa082ca fix distcheck --- diff --git a/examples/msg/trace-user-variables/trace-user-variables.tesh b/examples/msg/trace-user-variables/trace-user-variables.tesh index 0cb32efff5..d6942a6440 100644 --- a/examples/msg/trace-user-variables/trace-user-variables.tesh +++ b/examples/msg/trace-user-variables/trace-user-variables.tesh @@ -1,7 +1,7 @@ #! ./tesh p Tracing user variables -$ $SG_TEST_EXENV ${bindir:=.}/trace-user-variabless$EXEEXT --cfg=tracing:yes --cfg=tracing/platform:yes ${srcdir:=.}/small_platform.xml ${srcdir:=.}/../msg/masterslave/deployment_masterslave_mailbox.xml +$ $SG_TEST_EXENV ${bindir:=.}/trace-user-variables$EXEEXT --cfg=tracing:yes --cfg=tracing/platform:yes ${srcdir:=.}/small_platform.xml ${srcdir:=.}/../msg/masterslave/deployment_masterslave_mailbox.xml > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing' to 'yes' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/platform' to 'yes' > [0.004078] [msg_test/INFO] Declared host variables: @@ -19,4 +19,4 @@ $ $SG_TEST_EXENV ${bindir:=.}/trace-user-variabless$EXEEXT --cfg=tracing:yes -- $ rm -f viva_graph.plist p Not tracing user variables -$ $SG_TEST_EXENV ${bindir:=.}/trace-user-variabless$EXEEXT ${srcdir:=.}/small_platform.xml ${srcdir:=.}/../msg/masterslave/deployment_masterslave_mailbox.xml +$ $SG_TEST_EXENV ${bindir:=.}/trace-user-variables$EXEEXT ${srcdir:=.}/small_platform.xml ${srcdir:=.}/../msg/masterslave/deployment_masterslave_mailbox.xml diff --git a/examples/simdag/CMakeLists.txt b/examples/simdag/CMakeLists.txt index 94a35c850f..15769f1e77 100644 --- a/examples/simdag/CMakeLists.txt +++ b/examples/simdag/CMakeLists.txt @@ -13,8 +13,8 @@ set_target_properties(goal_test PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURR set(tesh_files ${tesh_files} PARENT_SCOPE) set(examples_src ${examples_src} ${CMAKE_CURRENT_SOURCE_DIR}/goal/goal_test.c PARENT_SCOPE) set(xml_files ${xml_files} ${CMAKE_CURRENT_SOURCE_DIR}/scheduling/Montage_25.xml - ${CMAKE_CURRENT_SOURCE_DIR}/dax/simple_dax_with_cycle.xml - ${CMAKE_CURRENT_SOURCE_DIR}/dax/smalldax.xml PARENT_SCOPE) + ${CMAKE_CURRENT_SOURCE_DIR}/daxload/simple_dax_with_cycle.xml + ${CMAKE_CURRENT_SOURCE_DIR}/daxload/smalldax.xml PARENT_SCOPE) set(bin_files ${bin_files} ${CMAKE_CURRENT_SOURCE_DIR}/platform_script.lua PARENT_SCOPE) set(txt_files ${txt_files} ${CMAKE_CURRENT_SOURCE_DIR}/dag-dotload/dag_with_cycle.dot ${CMAKE_CURRENT_SOURCE_DIR}/dag-dotload/dag.dot diff --git a/examples/simdag/dag-dotload/sd_dag-dotload.tesh b/examples/simdag/dag-dotload/sd_dag-dotload.tesh index 51a0029041..ebcfcd5a27 100644 --- a/examples/simdag/dag-dotload/sd_dag-dotload.tesh +++ b/examples/simdag/dag-dotload/sd_dag-dotload.tesh @@ -1,7 +1,7 @@ #! ./tesh p Test the loader of DAG written in the DOT format -$ $SG_TEST_EXENV ${bindir:=.}/dag-dotload/sd_dag-dotload --log=no_loc ${srcdir:=.}/../platforms/2clusters.xml ${srcdir:=.}/dag.dot +$ $SG_TEST_EXENV ${bindir:=.}/dag-dotload/sd_dag-dotload --log=no_loc ${srcdir:=.}/../platforms/2clusters.xml ${srcdir:=.}/dag-dotload/dag.dot > [0.000000] [xbt_cfg/INFO] Switching to the L07 model to handle parallel tasks. > [0.000000] [test/INFO] ------------------- Display all tasks of the loaded DAG --------------------------- > [0.000000] [sd_task/INFO] Displaying task root @@ -189,7 +189,7 @@ $ $SG_TEST_EXENV ${bindir:=.}/dag-dotload/sd_dag-dotload --log=no_loc ${srcdir:= > [62.002281] [test/INFO] ------------------- Produce the trace file--------------------------- > [62.002281] [test/INFO] Producing the trace of the run into dag.trace -$ cat ${srcdir:=.}/dag.trace +$ cat ${srcdir:=.}/dag-dotload/dag.trace > [0.000000->0.000000] C2-05 compute 0.000000 flops # root > [0.000000->2.000000] C2-06 compute 10000000129.452715 flops # 0 > [2.000380->4.000380] C2-07 compute 10000000131.133657 flops # 1 @@ -211,10 +211,10 @@ $ cat ${srcdir:=.}/dag.trace > [0.000000 -> 0.292217] C2-05 -> C1-01 transfer of 10014000 bytes # root->5 > [60.002281->62.002281] C2-05 compute 10000000129.452715 flops # end -$ rm -f dag.trace dot.dot +$ rm -f ${srcdir:=.}/dag-dotload/dag.trace ${srcdir:=.}/dag-dotload/dot.dot ! expect return 2 -$ $SG_TEST_EXENV ${bindir:=.}/dag-dotload/sd_dag-dotload --log=no_loc ${srcdir:=.}/../platforms/2clusters.xml ${srcdir:=.}/dag_with_cycle.dot +$ $SG_TEST_EXENV ${bindir:=.}/dag-dotload/sd_dag-dotload --log=no_loc ${srcdir:=.}/../platforms/2clusters.xml ${srcdir:=.}/dag-dotload/dag_with_cycle.dot > [0.000000] [xbt_cfg/INFO] Switching to the L07 model to handle parallel tasks. > [0.000000] [sd_daxparse/WARNING] the task root is not marked > [0.000000] [sd_daxparse/WARNING] the task 0 is in a cycle diff --git a/examples/simdag/daxload/sd_daxload.tesh b/examples/simdag/daxload/sd_daxload.tesh index e458f06f3a..badc49b1c2 100644 --- a/examples/simdag/daxload/sd_daxload.tesh +++ b/examples/simdag/daxload/sd_daxload.tesh @@ -1,7 +1,7 @@ #! ./tesh p Test the DAX loader on a small DAX instance -$ $SG_TEST_EXENV ${bindir:=.}/daxload/sd_daxload --log=no_loc ${srcdir:=.}/../platforms/2clusters.xml ${srcdir:=.}/dax/smalldax.xml +$ $SG_TEST_EXENV ${bindir:=.}/daxload/sd_daxload --log=no_loc ${srcdir:=.}/../platforms/2clusters.xml ${srcdir:=.}/daxload/smalldax.xml > [0.000000] [xbt_cfg/INFO] Switching to the L07 model to handle parallel tasks. > [0.000000] [sd_daxparse/WARNING] Ignore file o1 size redefinition from 1000000 to 304 > [0.000000] [sd_daxparse/WARNING] Ignore file o2 size redefinition from 1000000 to 304 @@ -103,7 +103,7 @@ $ $SG_TEST_EXENV ${bindir:=.}/daxload/sd_daxload --log=no_loc ${srcdir:=.}/../pl > [84.066238] [test/INFO] ------------------- Produce the trace file--------------------------- > [84.066238] [test/INFO] Producing the trace of the run into smalldax.trace -$ cat ${srcdir:=.}/dax/smalldax.trace +$ cat ${srcdir:=.}/daxload/smalldax.trace > [0.000000] C1-00 compute 0.000000 # root > [0.016300] C1-01 compute 42000000000.000000 # 1@task1 > [0.016300] C1-02 compute 42000000000.000000 # 2@task2 @@ -120,12 +120,12 @@ $ cat ${srcdir:=.}/dax/smalldax.trace > [0.016300] C1-01 recv C1-00 1000000.000000 # root_i1_1@task1 > [84.066238] C1-00 compute 0.000000 # end -$ cmake -E remove -f ${srcdir:=.}/dax.dot ${srcdir:=.}/dax/smalldax.trace +$ cmake -E remove -f ${srcdir:=.}/dax.dot ${srcdir:=.}/daxload/smalldax.trace p Test the DAX loader with a DAX comprising a cycle. ! expect return 255 -$ $SG_TEST_EXENV ${bindir:=.}/daxload/sd_daxload --log=no_loc ${srcdir:=.}/../platforms/2clusters.xml ${srcdir:=.}/dax/simple_dax_with_cycle.xml +$ $SG_TEST_EXENV ${bindir:=.}/daxload/sd_daxload --log=no_loc ${srcdir:=.}/../platforms/2clusters.xml ${srcdir:=.}/daxload/simple_dax_with_cycle.xml > [0.000000] [xbt_cfg/INFO] Switching to the L07 model to handle parallel tasks. > [0.000000] [sd_daxparse/WARNING] the task root is not marked > [0.000000] [sd_daxparse/WARNING] the task 1@task1 is in a cycle diff --git a/examples/simdag/ptg-dotload/sd_ptg-dotload.tesh b/examples/simdag/ptg-dotload/sd_ptg-dotload.tesh index f2f6d90a7f..2a33eafe93 100644 --- a/examples/simdag/ptg-dotload/sd_ptg-dotload.tesh +++ b/examples/simdag/ptg-dotload/sd_ptg-dotload.tesh @@ -1,7 +1,7 @@ #! ./tesh p Test the loader of PTG (Parallel Task Graph) written in the DOT format -$ $SG_TEST_EXENV ${bindir:=.}/ptg-dotload/sd_ptg-dotload ${srcdir:=.}/../platforms/2clusters.xml ${srcdir:=.}/ptg.dot +$ $SG_TEST_EXENV ${bindir:=.}/ptg-dotload/sd_ptg-dotload ${srcdir:=.}/../platforms/2clusters.xml ${srcdir:=.}/ptg-dotload/ptg.dot > [0.000000] [xbt_cfg/INFO] Switching to the L07 model to handle parallel tasks. > [0.000000] [test/INFO] ------------------- Display all tasks of the loaded DAG --------------------------- > [0.000000] [sd_task/INFO] Displaying task root diff --git a/examples/simdag/schedule-dotload/sd_schedule-dotload.tesh b/examples/simdag/schedule-dotload/sd_schedule-dotload.tesh index 6db0b7830e..9ac46d239e 100644 --- a/examples/simdag/schedule-dotload/sd_schedule-dotload.tesh +++ b/examples/simdag/schedule-dotload/sd_schedule-dotload.tesh @@ -2,7 +2,7 @@ p Test the loader of DAG written in the DOT format ! expect return 2 -$ $SG_TEST_EXENV ./simulate_dot --log=no_loc "--log=sd_dotparse.thres:verbose" ${srcdir:=.}/../../platforms/2clusters.xml ${srcdir:=.}/dag_with_bad_schedule.dot +$ $SG_TEST_EXENV ${bindir:=.}/schedule-dotload/sd_schedule-dotload --log=no_loc "--log=sd_dotparse.thres:verbose" ${srcdir:=.}/../platforms/2clusters.xml ${srcdir:=.}/schedule-dotload/dag_with_bad_schedule.dot > [0.000000] [xbt_cfg/INFO] Switching to the L07 model to handle parallel tasks. > [0.000000] [sd_dotparse/VERBOSE] The schedule is ignored, task 'end' can not be scheduled on -1 hosts > [0.000000] [sd_dotparse/VERBOSE] The schedule is ignored, task '1' can not be scheduled on 0 hosts @@ -12,7 +12,7 @@ $ $SG_TEST_EXENV ./simulate_dot --log=no_loc "--log=sd_dotparse.thres:verbose" > [0.000000] [sd_dotparse/WARNING] The scheduling is ignored > [0.000000] [test/CRITICAL] The dot file with the provided scheduling is wrong, more information with the option : --log=sd_dotparse.thres:verbose -$ $SG_TEST_EXENV ./simulate_dot --log=no_loc ${srcdir:=.}/../../platforms/2clusters.xml ${srcdir:=.}/dag_with_good_schedule.dot +$ $SG_TEST_EXENV ${bindir:=.}/schedule-dotload/sd_schedule-dotload --log=no_loc ${srcdir:=.}/../platforms/2clusters.xml ${srcdir:=.}/schedule-dotload/dag_with_good_schedule.dot > [0.000000] [xbt_cfg/INFO] Switching to the L07 model to handle parallel tasks. > [0.000000] [test/INFO] ------------------- Display all tasks of the loaded DAG --------------------------- > [0.000000] [sd_task/INFO] Displaying task root @@ -215,7 +215,7 @@ $ $SG_TEST_EXENV ./simulate_dot --log=no_loc ${srcdir:=.}/../../platforms/2clust > [20.000866] [test/INFO] ------------------- Produce the trace file--------------------------- > [20.000866] [test/INFO] Producing the trace of the run into dag_with_good_schedule.trace -$ cat ${srcdir:=.}/dag_with_good_schedule.trace +$ cat ${srcdir:=.}/schedule-dotload/dag_with_good_schedule.trace > [0.000000->0.000000] C2-05 compute 0.000000 flops # root > [0.000000->2.000000] C2-06 compute 10000000129.452715 flops # 0 > [0.000000->2.000000] C2-05 compute 10000000131.133657 flops # 1 @@ -237,5 +237,5 @@ $ cat ${srcdir:=.}/dag_with_good_schedule.trace > [14.000485 -> 14.020609] C2-05 -> C2-05 transfer of 10014000 bytes # 7->end > [18.000866->20.000866] C2-05 compute 10000000129.452715 flops # end -$ rm -f ${srcdir:=.}/dag_with_good_schedule.trace +$ rm -f ${srcdir:=.}/schedule-dotload/dag_with_good_schedule.trace