From 8cdf3e352cf30f8d3d52570851f7cbba7de3fed3 Mon Sep 17 00:00:00 2001 From: Augustin Degomme Date: Fri, 6 Mar 2020 14:07:26 +0100 Subject: [PATCH] requalify tesh to account for default value change for loopback link --- .../simdag/scheduling/sd_scheduling.tesh | 54 +++++++++---------- .../s4u/basic-link-test/basic-link-test.tesh | 4 +- .../simdag/availability/availability.tesh | 2 +- .../basic-parsing-test-bypass.tesh | 16 +++--- .../basic-parsing-test-sym-full.tesh | 40 +++++++------- teshsuite/simdag/flatifier/flatifier.tesh | 20 +++---- 6 files changed, 68 insertions(+), 68 deletions(-) diff --git a/examples/deprecated/simdag/scheduling/sd_scheduling.tesh b/examples/deprecated/simdag/scheduling/sd_scheduling.tesh index 04834e6a3a..5a04907aba 100644 --- a/examples/deprecated/simdag/scheduling/sd_scheduling.tesh +++ b/examples/deprecated/simdag/scheduling/sd_scheduling.tesh @@ -6,33 +6,33 @@ $ ${bindir:=.}/scheduling/sd_scheduling --log=sd_daxparse.thresh:critical ${srcd > [0.000000] [xbt_cfg/INFO] Switching to the L07 model to handle parallel tasks. > [0.000000] [test/INFO] Schedule ID00002@mProjectPP on Host 27 > [0.000105] [test/INFO] Schedule ID00000@mProjectPP on Host 26 -> [0.000120] [test/INFO] Schedule ID00003@mProjectPP on Host 30 -> [0.000325] [test/INFO] Schedule ID00004@mProjectPP on Host 27 -> [0.000433] [test/INFO] Schedule ID00001@mProjectPP on Host 32 -> [14.576312] [test/INFO] Schedule ID00010@mDiffFit on Host 26 -> [17.049690] [test/INFO] Schedule ID00008@mDiffFit on Host 27 -> [29.541409] [test/INFO] Schedule ID00013@mDiffFit on Host 26 -> [32.620710] [test/INFO] Schedule ID00009@mDiffFit on Host 30 -> [32.620912] [test/INFO] Schedule ID00011@mDiffFit on Host 27 -> [32.621015] [test/INFO] Schedule ID00005@mDiffFit on Host 26 -> [32.621030] [test/INFO] Schedule ID00006@mDiffFit on Host 32 -> [32.621243] [test/INFO] Schedule ID00012@mDiffFit on Host 31 -> [32.621345] [test/INFO] Schedule ID00007@mDiffFit on Host 28 -> [60.411166] [test/INFO] Schedule ID00014@mConcatFit on Host 27 -> [61.202997] [test/INFO] Schedule ID00015@mBgModel on Host 27 -> [62.745225] [test/INFO] Schedule ID00016@mBackground on Host 27 -> [62.745241] [test/INFO] Schedule ID00017@mBackground on Host 26 -> [62.745347] [test/INFO] Schedule ID00020@mBackground on Host 30 -> [62.745454] [test/INFO] Schedule ID00018@mBackground on Host 27 -> [62.745469] [test/INFO] Schedule ID00019@mBackground on Host 32 -> [88.539211] [test/INFO] Schedule ID00021@mImgTbl on Host 27 -> [90.115687] [test/INFO] Schedule ID00022@mAdd on Host 27 -> [93.406373] [test/INFO] Schedule ID00023@mShrink on Host 27 -> [97.691746] [test/INFO] Schedule ID00024@mJPEG on Host 27 -> [98.184198] [test/INFO] Schedule end on Host 27 -> [98.184625] [test/INFO] Simulation Time: 98.184625 -> [98.184625] [test/INFO] ------------------- Produce the trace file--------------------------- -> [98.184625] [test/INFO] Producing a jedule output (if active) of the run into minmin_test.jed +> [0.000105] [test/INFO] Schedule ID00003@mProjectPP on Host 30 +> [0.000310] [test/INFO] Schedule ID00004@mProjectPP on Host 27 +> [0.000417] [test/INFO] Schedule ID00001@mProjectPP on Host 32 +> [14.576327] [test/INFO] Schedule ID00010@mDiffFit on Host 26 +> [17.041620] [test/INFO] Schedule ID00008@mDiffFit on Host 27 +> [29.541425] [test/INFO] Schedule ID00013@mDiffFit on Host 26 +> [32.620694] [test/INFO] Schedule ID00009@mDiffFit on Host 30 +> [32.620897] [test/INFO] Schedule ID00011@mDiffFit on Host 27 +> [32.620999] [test/INFO] Schedule ID00005@mDiffFit on Host 26 +> [32.620999] [test/INFO] Schedule ID00006@mDiffFit on Host 32 +> [32.621211] [test/INFO] Schedule ID00012@mDiffFit on Host 31 +> [32.621314] [test/INFO] Schedule ID00007@mDiffFit on Host 28 +> [60.411150] [test/INFO] Schedule ID00014@mConcatFit on Host 27 +> [61.202981] [test/INFO] Schedule ID00015@mBgModel on Host 27 +> [62.745210] [test/INFO] Schedule ID00016@mBackground on Host 27 +> [62.745210] [test/INFO] Schedule ID00017@mBackground on Host 26 +> [62.745316] [test/INFO] Schedule ID00020@mBackground on Host 30 +> [62.745423] [test/INFO] Schedule ID00018@mBackground on Host 27 +> [62.745423] [test/INFO] Schedule ID00019@mBackground on Host 32 +> [88.539165] [test/INFO] Schedule ID00021@mImgTbl on Host 27 +> [90.115640] [test/INFO] Schedule ID00022@mAdd on Host 27 +> [93.406326] [test/INFO] Schedule ID00023@mShrink on Host 27 +> [97.602942] [test/INFO] Schedule ID00024@mJPEG on Host 27 +> [98.091829] [test/INFO] Schedule end on Host 27 +> [98.091849] [test/INFO] Simulation Time: 98.091849 +> [98.091849] [test/INFO] ------------------- Produce the trace file--------------------------- +> [98.091849] [test/INFO] Producing a jedule output (if active) of the run into minmin_test.jed ! output ignore diff --git a/teshsuite/s4u/basic-link-test/basic-link-test.tesh b/teshsuite/s4u/basic-link-test/basic-link-test.tesh index 21643ac4f5..d2b8048ecb 100644 --- a/teshsuite/s4u/basic-link-test/basic-link-test.tesh +++ b/teshsuite/s4u/basic-link-test/basic-link-test.tesh @@ -2,7 +2,7 @@ $ ./basic-link-test ${srcdir:=.}/../../simdag/platforms/one_cluster.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:maestro@) Link count: 12 -> [ 0.000000] (0:maestro@) __loopback__: latency = 0.00002, bandwidth = 498000000.000000 +> [ 0.000000] (0:maestro@) __loopback__: latency = 0.00000, bandwidth = 10000000000.000000 > [ 0.000000] (0:maestro@) bob_cluster_backbone: latency = 0.00050, bandwidth = 2250000000.000000 > [ 0.000000] (0:maestro@) bob_cluster_link_0_DOWN: latency = 0.00005, bandwidth = 125000000.000000 > [ 0.000000] (0:maestro@) bob_cluster_link_0_UP: latency = 0.00005, bandwidth = 125000000.000000 @@ -17,7 +17,7 @@ $ ./basic-link-test ${srcdir:=.}/../../simdag/platforms/one_cluster.xml "--log=r $ ./basic-link-test ${srcdir:=.}/../../simdag/platforms/link_attributes.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:maestro@) Link count: 5 -> [ 0.000000] (0:maestro@) __loopback__: latency = 0.00002, bandwidth = 498000000.000000 +> [ 0.000000] (0:maestro@) __loopback__: latency = 0.00000, bandwidth = 10000000000.000000 > [ 0.000000] (0:maestro@) link1: latency = 0.00005, bandwidth = 125000000.000000 > [ 0.000000] (0:maestro@) link2: latency = 0.00005, bandwidth = 125000000.000000 > [ 0.000000] (0:maestro@) link3: latency = 0.00010, bandwidth = 80000000.000000 diff --git a/teshsuite/simdag/availability/availability.tesh b/teshsuite/simdag/availability/availability.tesh index c32924ddd1..1df1900f3a 100644 --- a/teshsuite/simdag/availability/availability.tesh +++ b/teshsuite/simdag/availability/availability.tesh @@ -30,5 +30,5 @@ $ ${bindir:=.}/availability ../../../examples/platforms/simulacrum_7_hosts.xml > [0.000000] [test/INFO] Scheduling ID00024@mJPEG to node: Host 30 > [0.000000] [test/INFO] Scheduling end to node: Host 26 > [0.000000] [test/INFO] DAX scheduled -> [163.998635] [test/INFO] Simulation done. +> [163.990688] [test/INFO] Simulation done. diff --git a/teshsuite/simdag/basic-parsing-test/basic-parsing-test-bypass.tesh b/teshsuite/simdag/basic-parsing-test/basic-parsing-test-bypass.tesh index 398927f654..8d6094513c 100644 --- a/teshsuite/simdag/basic-parsing-test/basic-parsing-test-bypass.tesh +++ b/teshsuite/simdag/basic-parsing-test/basic-parsing-test-bypass.tesh @@ -69,8 +69,8 @@ $ ${bindir:=.}/basic-parsing-test ${srcdir:=.}/examples/platforms/bypassRoute.xm > Workstation number: 4, link number: 10 > Route between AS_2_host1 and AS_2_host1 > Route size 1 -> Link __loopback__: latency = 0.000015, bandwidth = 498000000.000000 -> Route latency = 0.000015, route bandwidth = 498000000.000000 +> Link __loopback__: latency = 0.000000, bandwidth = 10000000000.000000 +> Route latency = 0.000000, route bandwidth = 10000000000.000000 > Route between AS_2_host1 and AS_2_host2 > Route size 3 > Link AS_2_link7: latency = 0.000500, bandwidth = 1250000000.000000 @@ -96,8 +96,8 @@ $ ${bindir:=.}/basic-parsing-test ${srcdir:=.}/examples/platforms/bypassRoute.xm > Route latency = 0.001000, route bandwidth = 1250000000.000000 > Route between AS_2_host2 and AS_2_host2 > Route size 1 -> Link __loopback__: latency = 0.000015, bandwidth = 498000000.000000 -> Route latency = 0.000015, route bandwidth = 498000000.000000 +> Link __loopback__: latency = 0.000000, bandwidth = 10000000000.000000 +> Route latency = 0.000000, route bandwidth = 10000000000.000000 > Route between AS_2_host2 and AS_2_host3 > Route size 2 > Link AS_2_link2: latency = 0.000500, bandwidth = 1250000000.000000 @@ -122,8 +122,8 @@ $ ${bindir:=.}/basic-parsing-test ${srcdir:=.}/examples/platforms/bypassRoute.xm > Route latency = 0.001000, route bandwidth = 1250000000.000000 > Route between AS_2_host3 and AS_2_host3 > Route size 1 -> Link __loopback__: latency = 0.000015, bandwidth = 498000000.000000 -> Route latency = 0.000015, route bandwidth = 498000000.000000 +> Link __loopback__: latency = 0.000000, bandwidth = 10000000000.000000 +> Route latency = 0.000000, route bandwidth = 10000000000.000000 > Route between AS_2_host3 and AS_1_host1 > Route size 4 > Link AS_2_link3: latency = 0.000500, bandwidth = 1250000000.000000 @@ -154,5 +154,5 @@ $ ${bindir:=.}/basic-parsing-test ${srcdir:=.}/examples/platforms/bypassRoute.xm > Route latency = 0.002000, route bandwidth = 1250000000.000000 > Route between AS_1_host1 and AS_1_host1 > Route size 1 -> Link __loopback__: latency = 0.000015, bandwidth = 498000000.000000 -> Route latency = 0.000015, route bandwidth = 498000000.000000 +> Link __loopback__: latency = 0.000000, bandwidth = 10000000000.000000 +> Route latency = 0.000000, route bandwidth = 10000000000.000000 diff --git a/teshsuite/simdag/basic-parsing-test/basic-parsing-test-sym-full.tesh b/teshsuite/simdag/basic-parsing-test/basic-parsing-test-sym-full.tesh index 3e6a786b24..593f596dcc 100644 --- a/teshsuite/simdag/basic-parsing-test/basic-parsing-test-sym-full.tesh +++ b/teshsuite/simdag/basic-parsing-test/basic-parsing-test-sym-full.tesh @@ -278,8 +278,8 @@ $ ${bindir:=.}/basic-parsing-test ../platforms/two_hosts_one_link.xml FULL_LINK > Workstation number: 2, link number: 2 > Route between alice and alice > Route size 1 -> Link __loopback__: latency = 0.000015, bandwidth = 498000000.000000 -> Route latency = 0.000015, route bandwidth = 498000000.000000 +> Link __loopback__: latency = 0.000000, bandwidth = 10000000000.000000 +> Route latency = 0.000000, route bandwidth = 10000000000.000000 > Route between alice and bob > Route size 1 > Link link1: latency = 0.000050, bandwidth = 125000000.000000 @@ -290,8 +290,8 @@ $ ${bindir:=.}/basic-parsing-test ../platforms/two_hosts_one_link.xml FULL_LINK > Route latency = 0.000050, route bandwidth = 125000000.000000 > Route between bob and bob > Route size 1 -> Link __loopback__: latency = 0.000015, bandwidth = 498000000.000000 -> Route latency = 0.000015, route bandwidth = 498000000.000000 +> Link __loopback__: latency = 0.000000, bandwidth = 10000000000.000000 +> Route latency = 0.000000, route bandwidth = 10000000000.000000 ! output sort $ ${bindir:=.}/basic-parsing-test ../platforms/two_hosts_one_link_splitduplex.xml FULL_LINK "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" @@ -299,8 +299,8 @@ $ ${bindir:=.}/basic-parsing-test ../platforms/two_hosts_one_link_splitduplex.xm > Workstation number: 2, link number: 3 > Route between alice and alice > Route size 1 -> Link __loopback__: latency = 0.000015, bandwidth = 498000000.000000 -> Route latency = 0.000015, route bandwidth = 498000000.000000 +> Link __loopback__: latency = 0.000000, bandwidth = 10000000000.000000 +> Route latency = 0.000000, route bandwidth = 10000000000.000000 > Route between alice and bob > Route size 1 > Link link1_UP: latency = 0.000050, bandwidth = 125000000.000000 @@ -311,8 +311,8 @@ $ ${bindir:=.}/basic-parsing-test ../platforms/two_hosts_one_link_splitduplex.xm > Route latency = 0.000050, route bandwidth = 125000000.000000 > Route between bob and bob > Route size 1 -> Link __loopback__: latency = 0.000015, bandwidth = 498000000.000000 -> Route latency = 0.000015, route bandwidth = 498000000.000000 +> Link __loopback__: latency = 0.000000, bandwidth = 10000000000.000000 +> Route latency = 0.000000, route bandwidth = 10000000000.000000 ! output sort $ ${bindir:=.}/basic-parsing-test ../platforms/Dijkstra.xml FULL_LINK "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" @@ -320,8 +320,8 @@ $ ${bindir:=.}/basic-parsing-test ../platforms/Dijkstra.xml FULL_LINK "--log=roo > Workstation number: 2, link number: 6 > Route between NODO01 and NODO01 > Route size 1 -> Link __loopback__: latency = 0.000015, bandwidth = 498000000.000000 -> Route latency = 0.000015, route bandwidth = 498000000.000000 +> Link __loopback__: latency = 0.000000, bandwidth = 10000000000.000000 +> Route latency = 0.000000, route bandwidth = 10000000000.000000 > Route between NODO01 and NODO02 > Route size 2 > Link 1: latency = 0.001000, bandwidth = 1000000.000000 @@ -334,8 +334,8 @@ $ ${bindir:=.}/basic-parsing-test ../platforms/Dijkstra.xml FULL_LINK "--log=roo > Route latency = 0.002000, route bandwidth = 1000000.000000 > Route between NODO02 and NODO02 > Route size 1 -> Link __loopback__: latency = 0.000015, bandwidth = 498000000.000000 -> Route latency = 0.000015, route bandwidth = 498000000.000000 +> Link __loopback__: latency = 0.000000, bandwidth = 10000000000.000000 +> Route latency = 0.000000, route bandwidth = 10000000000.000000 ! output sort $ ${bindir:=.}/basic-parsing-test ../platforms/four_hosts_floyd.xml FULL_LINK @@ -343,8 +343,8 @@ $ ${bindir:=.}/basic-parsing-test ../platforms/four_hosts_floyd.xml FULL_LINK > Workstation number: 4, link number: 5 > Route between host1 and host1 > Route size 1 -> Link __loopback__: latency = 0.000015, bandwidth = 498000000.000000 -> Route latency = 0.000015, route bandwidth = 498000000.000000 +> Link __loopback__: latency = 0.000000, bandwidth = 10000000000.000000 +> Route latency = 0.000000, route bandwidth = 10000000000.000000 > Route between host1 and host2 > Route size 1 > Link link1: latency = 0.000050, bandwidth = 125000000.000000 @@ -364,8 +364,8 @@ $ ${bindir:=.}/basic-parsing-test ../platforms/four_hosts_floyd.xml FULL_LINK > Route latency = 0.000050, route bandwidth = 125000000.000000 > Route between host2 and host2 > Route size 1 -> Link __loopback__: latency = 0.000015, bandwidth = 498000000.000000 -> Route latency = 0.000015, route bandwidth = 498000000.000000 +> Link __loopback__: latency = 0.000000, bandwidth = 10000000000.000000 +> Route latency = 0.000000, route bandwidth = 10000000000.000000 > Route between host2 and host3 > Route size 1 > Link link3: latency = 0.000050, bandwidth = 125000000.000000 @@ -385,8 +385,8 @@ $ ${bindir:=.}/basic-parsing-test ../platforms/four_hosts_floyd.xml FULL_LINK > Route latency = 0.000050, route bandwidth = 125000000.000000 > Route between host3 and host3 > Route size 1 -> Link __loopback__: latency = 0.000015, bandwidth = 498000000.000000 -> Route latency = 0.000015, route bandwidth = 498000000.000000 +> Link __loopback__: latency = 0.000000, bandwidth = 10000000000.000000 +> Route latency = 0.000000, route bandwidth = 10000000000.000000 > Route between host3 and host4 > Route size 1 > Link link4: latency = 0.000050, bandwidth = 125000000.000000 @@ -407,5 +407,5 @@ $ ${bindir:=.}/basic-parsing-test ../platforms/four_hosts_floyd.xml FULL_LINK > Route latency = 0.000050, route bandwidth = 125000000.000000 > Route between host4 and host4 > Route size 1 -> Link __loopback__: latency = 0.000015, bandwidth = 498000000.000000 -> Route latency = 0.000015, route bandwidth = 498000000.000000 +> Link __loopback__: latency = 0.000000, bandwidth = 10000000000.000000 +> Route latency = 0.000000, route bandwidth = 10000000000.000000 diff --git a/teshsuite/simdag/flatifier/flatifier.tesh b/teshsuite/simdag/flatifier/flatifier.tesh index 90d20da2cd..941b4eb557 100644 --- a/teshsuite/simdag/flatifier/flatifier.tesh +++ b/teshsuite/simdag/flatifier/flatifier.tesh @@ -11,7 +11,7 @@ $ ${bindir:=.}/flatifier ../platforms/one_cluster.xml "--log=root.fmt:[%10.6r]%e > > > -> +> > > > @@ -146,7 +146,7 @@ $ ${bindir:=.}/flatifier ../platforms/one_cluster_multicore.xml "--log=root.fmt: > > > -> +> > > > @@ -283,7 +283,7 @@ $ ${bindir:=.}/flatifier ../platforms/host_attributes.xml "--log=root.fmt:[%10.6 > > > -> +> > > > @@ -309,7 +309,7 @@ $ ${bindir:=.}/flatifier ../platforms/link_attributes.xml "--log=root.fmt:[%10.6 > > > -> +> > > > @@ -329,7 +329,7 @@ $ ${bindir:=.}/flatifier ../platforms/three_hosts_non_symmetric_route.xml "--log > > > -> +> > > > @@ -375,7 +375,7 @@ $ ${bindir:=.}/flatifier ../platforms/two_clusters.xml "--log=root.fmt:[%10.6r]% > > > -> +> > > > @@ -506,7 +506,7 @@ $ ${bindir:=.}/flatifier ../platforms/two_hosts_multi_hop.xml "--log=root.fmt:[% > > > -> +> > > > @@ -533,7 +533,7 @@ $ ${bindir:=.}/flatifier ../platforms/two_hosts_one_link.xml "--log=root.fmt:[%1 > > > -> +> > > > @@ -562,7 +562,7 @@ $ ${bindir:=.}/flatifier ${srcdir:=.}/examples/platforms/bypassASroute.xml "--lo > > > -> +> > > > @@ -703,7 +703,7 @@ $ ${bindir:=.}/flatifier ${srcdir:=.}/examples/platforms/cluster_torus.xml "--lo > > > -> +> > > > -- 2.20.1