revalidate (ans simplify) tesh outputs

diff --git a/teshsuite/simdag/basic0.tesh b/teshsuite/simdag/basic0.tesh
index a8eeb8d708f3d5ed6afe40b5fa37f1ee1d5a3e51..058880837ded48daa797a0aef53fd5eb137efe21 100644 (file)
--- a/teshsuite/simdag/basic0.tesh
+++ b/teshsuite/simdag/basic0.tesh
@@ -1,3 +1,3 @@
-$ simdag/basic0 ${srcdir:=.}/simdag/basic_platform.xml --surf-path=${srcdir} "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
-> [  0.000000] (0:@) surf_workstation_model_init_ptask_L07
-> [  1.000100] (0:@) Simulation time: 1.000100
+$ simdag/basic0 ${srcdir:=.}/simdag/basic_platform.xml --surf-path=${srcdir} "--log=root.fmt:[%10.6r]%e%m%n"
+> [  0.000000] surf_workstation_model_init_ptask_L07
+> [  0.800100] Simulation time: 0.800100

diff --git a/teshsuite/simdag/basic2.tesh b/teshsuite/simdag/basic2.tesh
index 011f97ef69152681c6dd7b18b145c1fcbf1dff73..2614e4e17e374501d20546ba13f20fc9e76b97e0 100644 (file)
--- a/teshsuite/simdag/basic2.tesh
+++ b/teshsuite/simdag/basic2.tesh
@@ -1,3 +1,3 @@
 $ simdag/basic2 ${srcdir:=.}/simdag/basic_platform.xml --surf-path=${srcdir} "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
 > [  0.000000] (0:@) surf_workstation_model_init_ptask_L07
 $ simdag/basic2 ${srcdir:=.}/simdag/basic_platform.xml --surf-path=${srcdir} "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
 > [  0.000000] (0:@) surf_workstation_model_init_ptask_L07

-> [ 10.600100] (0:@) Simulation time: 10.600100
+> [  8.800100] (0:@) Simulation time: 8.800100
\ No newline at end of file

diff --git a/teshsuite/simdag/basic3.tesh b/teshsuite/simdag/basic3.tesh
index ac9a3c11b5a2ee23f19ac0382afcedcc15c73c55..fb512dac843e1c3453c26722db9db4a051280ade 100644 (file)
--- a/teshsuite/simdag/basic3.tesh
+++ b/teshsuite/simdag/basic3.tesh
@@ -1,3 +1,11 @@
-$ simdag/basic3 ${srcdir:=.}/simdag/basic_platform.xml --surf-path=${srcdir} "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
-> [  0.000000] (0:@) surf_workstation_model_init_ptask_L07
-> [  0.000000] (0:@) Simulation time: 0.000000
+$ simdag/basic3 ${srcdir:=.}/simdag/basic_platform.xml --surf-path=${srcdir} "--log=root.fmt:[%10.6r]%e%m%n" --log=sd_kernel.thresh:verbose
+> [  0.000000] surf_workstation_model_init_ptask_L07
+> [  0.000000] Starting simulation...
+> [  0.000000] Run simulation for -1.000000 seconds
+> [  0.000000] Executing task 'Task Init'
+> [  0.000000] Task 'Task Init' done
+> [  0.000000] Executing task 'Task A'
+> [  0.000000] Task 'Task A' done
+> [  0.000000] Executing task 'Task Fin'
+> [  0.000000] Task 'Task Fin' done
+> [  0.000000] Simulation time: 0.000000

diff --git a/teshsuite/simdag/basic4.tesh b/teshsuite/simdag/basic4.tesh
index b098d980ca2cb12775d94d5ec5c834a98785f995..b6ca71ae1cf6b8975d0f6bd93e1198f1fcb30782 100644 (file)
--- a/teshsuite/simdag/basic4.tesh
+++ b/teshsuite/simdag/basic4.tesh
@@ -1,3 +1,11 @@
-$ simdag/basic4 ${srcdir:=.}/simdag/basic_platform.xml --surf-path=${srcdir} "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
-> [  0.000000] (0:@) surf_workstation_model_init_ptask_L07
-> [  0.000100] (0:@) Simulation time: 0.000100
+$ simdag/basic4 ${srcdir:=.}/simdag/basic_platform.xml --surf-path=${srcdir} "--log=root.fmt:[%10.6r]%e%m%n" --log=sd_kernel.thresh:verbose
+> [  0.000000] surf_workstation_model_init_ptask_L07
+> [  0.000000] Starting simulation...
+> [  0.000000] Run simulation for -1.000000 seconds
+> [  0.000000] Executing task 'Task Init'
+> [  0.000000] Task 'Task Init' done
+> [  0.000000] Executing task 'Task A'
+> [  0.000100] Task 'Task A' done
+> [  0.000100] Executing task 'Task Fin'
+> [  0.000100] Task 'Task Fin' done
+> [  0.000100] Simulation time: 0.000100

diff --git a/teshsuite/simdag/basic5.tesh b/teshsuite/simdag/basic5.tesh
index 21d58147989371b6b3f6002748079eb04f7820aa..cdb06cbfd44dda120890021f7744790d721509f4 100644 (file)
--- a/teshsuite/simdag/basic5.tesh
+++ b/teshsuite/simdag/basic5.tesh
@@ -1,3 +1,3 @@
-$ simdag/basic5 ${srcdir:=.}/simdag/basic_platform.xml --surf-path=${srcdir} "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
-> [  0.000000] (0:@) surf_workstation_model_init_ptask_L07
-> [  0.002500] (0:@) Simulation time: 0.002500
+$ simdag/basic5 ${srcdir:=.}/simdag/basic_platform.xml --surf-path=${srcdir} "--log=root.fmt:[%10.6r]%e%m%n"
+> [  0.000000] surf_workstation_model_init_ptask_L07
+> [  0.002500] Simulation time: 0.002500

diff --git a/teshsuite/simdag/basic6.tesh b/teshsuite/simdag/basic6.tesh
index 5435cb2ea142917da78ac96f2caca4f419623461..a4478e0b83269a558b9dd397199ee8dfcd2b4392 100644 (file)
--- a/teshsuite/simdag/basic6.tesh
+++ b/teshsuite/simdag/basic6.tesh
@@ -1,3 +1,3 @@
-$ simdag/basic6 ${srcdir:=.}/simdag/network/p2p/platform_2p_1sl.xml --surf-path=${srcdir} "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
-> [  0.000000] (0:@) surf_workstation_model_init_ptask_L07
-> [  2.000000] (0:@) Simulation time: 2.000000
+$ simdag/basic6 ${srcdir:=.}/simdag/network/p2p/platform_2p_1sl.xml --surf-path=${srcdir} "--log=root.fmt:[%10.6r]%e%m%n"
+> [  0.000000] surf_workstation_model_init_ptask_L07
+> [  2.000000] Simulation time: 2.000000

diff --git a/teshsuite/simdag/incomplete.tesh b/teshsuite/simdag/incomplete.tesh
index b7f40b2732296d554fc70bf569c8ef06fd2f0202..c237b85a025e3cd69b0698df3c5a27e59cf7418b 100644 (file)
--- a/teshsuite/simdag/incomplete.tesh
+++ b/teshsuite/simdag/incomplete.tesh
@@ -1,7 +1,7 @@
-$ simdag/incomplete ${srcdir:=.}/simdag/basic_platform.xml --surf-path=${srcdir} "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
-> [  0.000000] (0:@) surf_workstation_model_init_ptask_L07
-> [ 10.000100] (0:@) Simulation is finished but 3 tasks are still not done
-> [ 10.000100] (0:@) Task C is in SD_NOT_SCHEDULED state
-> [ 10.000100] (0:@) Task B is in SD_SCHEDULABLE state
-> [ 10.000100] (0:@) Task D is in SD_SCHEDULED state
-> [ 10.000100] (0:@) Simulation time: 10.000100
+$ simdag/incomplete ${srcdir:=.}/simdag/basic_platform.xml --surf-path=${srcdir} "--log=root.fmt:[%10.6r]%e%m%n"
+> [  0.000000] surf_workstation_model_init_ptask_L07
+> [  8.000100] Simulation is finished but 3 tasks are still not done
+> [  8.000100] Task C is in SD_NOT_SCHEDULED state
+> [  8.000100] Task B is in SD_SCHEDULABLE state
+> [  8.000100] Task D is in SD_SCHEDULED state
+> [  8.000100] Simulation time: 8.000100