These one ara also part of ctest. Take the INFO->VERB into account too

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@7837 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/examples/simdag/sd_test2.c b/examples/simdag/sd_test2.c
index 9870e3c..99e04dc 100644 (file)
--- a/examples/simdag/sd_test2.c
+++ b/examples/simdag/sd_test2.c
@@ -196,6 +196,8 @@ int main(int argc, char **argv)
   /* let's launch the simulation! */
   changed_tasks = SD_simulate(-1.0);
 
   /* let's launch the simulation! */
   changed_tasks = SD_simulate(-1.0);
 

+  INFO1("Simulation time: %f", SD_get_clock());
+

   free(changed_tasks);
 
   free(ParComp_wocomm_table);
   free(changed_tasks);
 
   free(ParComp_wocomm_table);

diff --git a/examples/simdag/test_simdag.tesh b/examples/simdag/test_simdag.tesh
index 658accf..0f46dea 100644 (file)
--- a/examples/simdag/test_simdag.tesh
+++ b/examples/simdag/test_simdag.tesh
@@ -15,13 +15,5 @@ $ $SG_TEST_EXENV ./sd_test ${srcdir:=.}/../msg/msg_platform.xml
 > [0.000000] [sd_test/INFO] Communication time for 2000000.000000 bytes between Jacquelin and Intel: 4.306781
 > [0.000000] [sd_test/INFO] Communication time for 3000000.000000 bytes between Intel and Jacquelin: 6.424864
 > [0.000000] [sd_test/INFO] Estimated time for 'Task D': 6.432146
 > [0.000000] [sd_test/INFO] Communication time for 2000000.000000 bytes between Jacquelin and Intel: 4.306781
 > [0.000000] [sd_test/INFO] Communication time for 3000000.000000 bytes between Intel and Jacquelin: 6.424864
 > [0.000000] [sd_test/INFO] Estimated time for 'Task D': 6.432146

-> [0.000000] [sd_kernel/INFO] Starting simulation...
-> [0.000000] [sd_kernel/INFO] Executing task 'Task D'
-> [1271.136703] [sd_kernel/INFO] Task 'Task D' done
-> [1271.136703] [sd_kernel/INFO] Executing task 'Task B'
-> [1271.136703] [sd_kernel/INFO] Executing task 'Task C'
-> [2118.584711] [sd_kernel/INFO] Task 'Task B' done
-> [2118.584711] [sd_task/INFO] Watch point reached with task 'Task B'!
-> [2118.584711] [sd_kernel/INFO] Simulation finished

 > [2118.584711] [sd_test/INFO] Task 'Task D' start time: 0.000000, finish time: 1271.136703
 > [2118.584711] [sd_test/INFO] Task 'Task B' start time: 1271.136703, finish time: 2118.584711
 > [2118.584711] [sd_test/INFO] Task 'Task D' start time: 0.000000, finish time: 1271.136703
 > [2118.584711] [sd_test/INFO] Task 'Task B' start time: 1271.136703, finish time: 2118.584711

diff --git a/examples/simdag/test_simdag2.tesh b/examples/simdag/test_simdag2.tesh
index 550196d..a1240a3 100644 (file)
--- a/examples/simdag/test_simdag2.tesh
+++ b/examples/simdag/test_simdag2.tesh
@@ -3,23 +3,4 @@
 p Simple test of simdag
 
 $ $SG_TEST_EXENV ./sd_test2 ${srcdir:=.}/2clusters.xml
 p Simple test of simdag
 
 $ $SG_TEST_EXENV ./sd_test2 ${srcdir:=.}/2clusters.xml

-> [0.000000] [sd_kernel/INFO] Starting simulation...
-> [0.000000] [sd_kernel/INFO] Executing task 'Initial'
-> [0.000000] [sd_kernel/INFO] Task 'Initial' done
-> [0.000000] [sd_kernel/INFO] Executing task 'PtoP Comm 1'
-> [0.000000] [sd_kernel/INFO] Executing task 'PtoP Comm 2'
-> [0.037800] [sd_kernel/INFO] Task 'PtoP Comm 2' done
-> [0.375300] [sd_kernel/INFO] Task 'PtoP Comm 1' done
-> [0.375300] [sd_kernel/INFO] Executing task 'Par Comp without comm'
-> [1.375300] [sd_kernel/INFO] Task 'Par Comp without comm' done
-> [1.375300] [sd_kernel/INFO] Executing task 'intra redist'
-> [1.395600] [sd_kernel/INFO] Task 'intra redist' done
-> [1.395600] [sd_kernel/INFO] Executing task 'Par Comp with comm 1'
-> [2.395900] [sd_kernel/INFO] Task 'Par Comp with comm 1' done
-> [2.395900] [sd_kernel/INFO] Executing task 'inter redist'
-> [8.771500] [sd_kernel/INFO] Task 'inter redist' done
-> [8.771500] [sd_kernel/INFO] Executing task 'Par Comp with comm 2'
-> [8.811800] [sd_kernel/INFO] Task 'Par Comp with comm 2' done
-> [8.811800] [sd_kernel/INFO] Executing task 'Final'
-> [9.811800] [sd_kernel/INFO] Task 'Final' done
-> [9.811800] [sd_kernel/INFO] Simulation finished
+> [9.811800] [sd_test/INFO] Simulation time: 9.811800