Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
[mc] Ignore stdout/stderr of the umpire tests
authorGabriel Corona <gabriel.corona@loria.fr>
Thu, 30 Jul 2015 10:08:13 +0000 (12:08 +0200)
committerGabriel Corona <gabriel.corona@loria.fr>
Thu, 30 Jul 2015 15:25:27 +0000 (17:25 +0200)
The no-errors test are still broken.

24 files changed:
teshsuite/smpi/isp/umpire/any_src-can-deadlock10.tesh
teshsuite/smpi/isp/umpire/any_src-can-deadlock4.tesh
teshsuite/smpi/isp/umpire/any_src-can-deadlock5.tesh
teshsuite/smpi/isp/umpire/any_src-can-deadlock6.tesh
teshsuite/smpi/isp/umpire/any_src-wait-deadlock.tesh
teshsuite/smpi/isp/umpire/any_src-waitall-deadlock2.tesh
teshsuite/smpi/isp/umpire/any_src-waitall-deadlock3.tesh
teshsuite/smpi/isp/umpire/any_src-waitany-deadlock.tesh
teshsuite/smpi/isp/umpire/any_src-waitany-deadlock2.tesh
teshsuite/smpi/isp/umpire/basic-deadlock-comm_create.tesh
teshsuite/smpi/isp/umpire/basic-deadlock-comm_dup.tesh
teshsuite/smpi/isp/umpire/basic-deadlock-comm_split.tesh
teshsuite/smpi/isp/umpire/basic-deadlock.tesh
teshsuite/smpi/isp/umpire/bcast-deadlock.tesh
teshsuite/smpi/isp/umpire/collective-misorder-allreduce.tesh
teshsuite/smpi/isp/umpire/collective-misorder.tesh
teshsuite/smpi/isp/umpire/complex-deadlock.tesh
teshsuite/smpi/isp/umpire/deadlock-config.tesh
teshsuite/smpi/isp/umpire/finalize-deadlock.tesh
teshsuite/smpi/isp/umpire/irecv-deadlock.tesh
teshsuite/smpi/isp/umpire/no-error.tesh
teshsuite/smpi/isp/umpire/no-error2.tesh
teshsuite/smpi/isp/umpire/no-error3-any_src.tesh
teshsuite/smpi/isp/umpire/no-error3.tesh

index 38d9bee..ac9ca92 100644 (file)
@@ -1,6 +1,7 @@
 #! ./tesh
 
-! expect return 134
+! expect return 3
+! output display
 $ ${bindir:=.}/../../../../bin/smpirun -wrapper "${bindir:=.}/../../../../bin/simgrid-mc" -hostfile ../../hostfile -platform ../../../../examples/platforms/small_platform.xml -np 3 --log=xbt_cfg.thresh:warning --cfg=model-check:1 --cfg=smpi/running_power:1e9 --cfg=smpi/coll_selector:mpich ${bindir:=.}/any_src-can-deadlock10 --log=smpi_coll.thresh:error
 > [0.000000] [mc_safety/INFO] Check a safety property
 > (0) is alive on Tremblay
index 6927192..4a571d4 100644 (file)
@@ -1,6 +1,7 @@
 #! ./tesh
 
-! expect return 134
+! expect return 3
+! output display
 $ ${bindir:=.}/../../../../bin/smpirun -wrapper "${bindir:=.}/../../../../bin/simgrid-mc" -hostfile ../../hostfile -platform ../../../../examples/platforms/small_platform.xml -np 3 --log=xbt_cfg.thresh:warning --cfg=model-check:1 --cfg=smpi/running_power:1e9 --cfg=smpi/coll_selector:mpich ${bindir:=.}/any_src-can-deadlock4 --log=smpi_coll.thresh:error
 > [0.000000] [mc_safety/INFO] Check a safety property
 > (0) is alive on Tremblay
index d6de021..f2d8447 100644 (file)
@@ -1,6 +1,7 @@
 #! ./tesh
 
-! expect return 134
+! expect return 3
+! output display
 $ ${bindir:=.}/../../../../bin/smpirun -wrapper "${bindir:=.}/../../../../bin/simgrid-mc" -hostfile ../../hostfile -platform ../../../../examples/platforms/small_platform.xml -np 3 --cfg=model-check:1 --cfg=smpi/running_power:1e9 --log=xbt_cfg.thresh:warning --cfg=smpi/coll_selector:mpich ${bindir:=.}/any_src-can-deadlock5 --log=smpi_coll.thresh:error
 > [0.000000] [mc_safety/INFO] Check a safety property
 > (0) is alive on Tremblay
index 5dcfc9d..80a06f3 100644 (file)
@@ -1,6 +1,7 @@
 #! ./tesh
 
-! expect return 134
+! expect return 3
+! output display
 $ ${bindir:=.}/../../../../bin/smpirun -wrapper "${bindir:=.}/../../../../bin/simgrid-mc" -hostfile ../../hostfile -platform ../../../../examples/platforms/small_platform.xml --log=xbt_cfg.thresh:warning -np 3 --cfg=model-check:1 --cfg=smpi/running_power:1e9 --cfg=smpi/coll_selector:mpich ${bindir:=.}/any_src-can-deadlock6 --log=smpi_coll.thresh:error
 > [0.000000] [mc_safety/INFO] Check a safety property
 > (0) is alive on Tremblay
index f902c2c..cb731e1 100644 (file)
@@ -1,6 +1,7 @@
 #! ./tesh
 
-! expect return 134
+! expect return 3
+! output display
 $ ${bindir:=.}/../../../../bin/smpirun -wrapper "${bindir:=.}/../../../../bin/simgrid-mc" -hostfile ../../hostfile -platform ../../../../examples/platforms/small_platform.xml --log=xbt_cfg.thresh:warning -np 3 --cfg=model-check:1 --cfg=smpi/running_power:1e9 --cfg=smpi/coll_selector:mpich ${bindir:=.}/any_src-wait-deadlock --log=smpi_coll.thresh:error
 > [0.000000] [mc_safety/INFO] Check a safety property
 > (0) is alive on Tremblay
index 1948ddf..7f842b4 100644 (file)
@@ -1,6 +1,7 @@
 #! ./tesh
 
-! expect return 134
+! expect return 3
+! output display
 $ ${bindir:=.}/../../../../bin/smpirun -wrapper "${bindir:=.}/../../../../bin/simgrid-mc" -hostfile ../../hostfile -platform ../../../../examples/platforms/small_platform.xml --log=xbt_cfg.thresh:warning -np 3 --cfg=model-check:1 --cfg=smpi/running_power:1e9 --cfg=smpi/coll_selector:mpich ${bindir:=.}/any_src-waitall-deadlock2 --log=smpi_coll.thresh:error
 > [0.000000] [mc_safety/INFO] Check a safety property
 > (0) is alive on Tremblay
index df50455..2c76480 100644 (file)
@@ -1,6 +1,7 @@
 #! ./tesh
 
-! expect return 134
+! expect return 3
+! output display
 $ ${bindir:=.}/../../../../bin/smpirun -wrapper "${bindir:=.}/../../../../bin/simgrid-mc" -hostfile ../../hostfile -platform ../../../../examples/platforms/small_platform.xml --log=xbt_cfg.thresh:warning -np 3 --cfg=model-check:1 --cfg=smpi/running_power:1e9 --cfg=smpi/coll_selector:mpich ${bindir:=.}/any_src-waitall-deadlock3 --log=smpi_coll.thresh:error
 > [0.000000] [mc_safety/INFO] Check a safety property
 > (0) is alive on Tremblay
index 251f9b6..41ce92f 100644 (file)
@@ -1,6 +1,7 @@
 #! ./tesh
 
-! expect return 134
+! expect return 3
+! output display
 $ ${bindir:=.}/../../../../bin/smpirun -wrapper "${bindir:=.}/../../../../bin/simgrid-mc" -hostfile ../../hostfile -platform ../../../../examples/platforms/small_platform.xml --log=xbt_cfg.thresh:warning -np 3 --cfg=model-check:1 --cfg=smpi/running_power:1e9 --cfg=smpi/coll_selector:mpich ${bindir:=.}/any_src-waitany-deadlock --log=smpi_coll.thresh:error
 > [0.000000] [mc_safety/INFO] Check a safety property
 > (0) is alive on Tremblay
index 2872722..9fabceb 100644 (file)
@@ -1,6 +1,7 @@
 #! ./tesh
 
-! expect return 134
+! expect return 3
+! output display
 $ ${bindir:=.}/../../../../bin/smpirun -wrapper "${bindir:=.}/../../../../bin/simgrid-mc" -hostfile ../../hostfile -platform ../../../../examples/platforms/small_platform.xml --log=xbt_cfg.thresh:warning -np 3 --cfg=model-check:1 --cfg=smpi/running_power:1e9 --cfg=smpi/coll_selector:mpich ${bindir:=.}/any_src-waitany-deadlock2 --log=smpi_coll.thresh:error
 > [0.000000] [mc_safety/INFO] Check a safety property
 > (0) is alive on Tremblay
index 632510b..7b3e99c 100644 (file)
@@ -1,6 +1,7 @@
 #! ./tesh
 
-! expect return 134
+! expect return 3
+! output display
 $ ${bindir:=.}/../../../../bin/smpirun -wrapper "${bindir:=.}/../../../../bin/simgrid-mc" --log=xbt_cfg.thresh:warning -hostfile ../../hostfile -platform ../../../../examples/platforms/small_platform.xml -np 3 --cfg=model-check:1 --cfg=smpi/running_power:1e9 --cfg=smpi/coll_selector:mpich ${bindir:=.}/basic-deadlock-comm_create --log=smpi_coll.thresh:error
 > [0.000000] [mc_safety/INFO] Check a safety property
 > (0) is alive on Tremblay
index 42fcf5a..fdaa201 100644 (file)
@@ -1,6 +1,7 @@
 #! ./tesh
 
-! expect return 134
+! expect return 3
+! output display
 $ ${bindir:=.}/../../../../bin/smpirun -wrapper "${bindir:=.}/../../../../bin/simgrid-mc" -hostfile ../../hostfile -platform ../../../../examples/platforms/small_platform.xml --log=xbt_cfg.thresh:warning -np 3 --cfg=model-check:1 --cfg=smpi/running_power:1e9 --cfg=smpi/coll_selector:mpich ${bindir:=.}/basic-deadlock-comm_dup --log=smpi_coll.thresh:error
 > [0.000000] [mc_safety/INFO] Check a safety property
 > (0) is alive on Tremblay
index 4a68058..627123f 100644 (file)
@@ -1,6 +1,7 @@
 #! ./tesh
 
-! expect return 134
+! expect return 3
+! output display
 $ ${bindir:=.}/../../../../bin/smpirun -wrapper "${bindir:=.}/../../../../bin/simgrid-mc" -hostfile ../../hostfile -platform ../../../../examples/platforms/small_platform.xml --log=xbt_cfg.thresh:warning -np 3 --cfg=model-check:1 --cfg=smpi/running_power:1e9 --cfg=smpi/coll_selector:mpich ${bindir:=.}/basic-deadlock-comm_split --log=smpi_coll.thresh:error
 > [0.000000] [mc_safety/INFO] Check a safety property
 > (0) is alive on Tremblay
index 5b7d2a7..0135502 100644 (file)
@@ -1,6 +1,7 @@
 #! ./tesh
 
-! expect return 134
+! expect return 3
+! output display
 $ ${bindir:=.}/../../../../bin/smpirun -wrapper "${bindir:=.}/../../../../bin/simgrid-mc" -hostfile ../../hostfile -platform ../../../../examples/platforms/small_platform.xml --log=xbt_cfg.thresh:warning -np 3 --cfg=model-check:1 --cfg=smpi/running_power:1e9 --cfg=smpi/coll_selector:mpich ${bindir:=.}/basic-deadlock --log=smpi_coll.thresh:error
 > [0.000000] [mc_safety/INFO] Check a safety property
 > (0) is alive on Tremblay
index 1f54c9f..69e59f0 100644 (file)
@@ -1,6 +1,7 @@
 #! ./tesh
 
-! expect return 134
+! expect return 3
+! output display
 $ ${bindir:=.}/../../../../bin/smpirun -wrapper "${bindir:=.}/../../../../bin/simgrid-mc" -hostfile ../../hostfile -platform ../../../../examples/platforms/small_platform.xml --log=xbt_cfg.thresh:warning -np 3 --cfg=model-check:1 --cfg=smpi/running_power:1e9 --cfg=smpi/coll_selector:mpich ${bindir:=.}/bcast-deadlock --log=smpi_coll.thresh:error
 > [0.000000] [mc_safety/INFO] Check a safety property
 > (0) is alive on Tremblay
index fc22e96..503a519 100644 (file)
@@ -1,6 +1,7 @@
 #! ./tesh
 
-! expect return 134
+! expect return 3
+! output display
 $ ${bindir:=.}/../../../../bin/smpirun -wrapper "${bindir:=.}/../../../../bin/simgrid-mc" -hostfile ../../hostfile -platform ../../../../examples/platforms/small_platform.xml --log=xbt_cfg.thresh:warning -np 3 --cfg=model-check:1 --cfg=smpi/running_power:1e9 --cfg=smpi/coll_selector:mpich ${bindir:=.}/collective-misorder-allreduce --log=smpi_coll.thresh:error
 > [0.000000] [mc_safety/INFO] Check a safety property
 > (0) is alive on Tremblay
index 5f0d591..e87bc38 100644 (file)
@@ -1,6 +1,7 @@
 #! ./tesh
 
-! expect return 134
+! expect return 3
+! output display
 $ ${bindir:=.}/../../../../bin/smpirun -wrapper "${bindir:=.}/../../../../bin/simgrid-mc" -hostfile ../../hostfile -platform ../../../../examples/platforms/small_platform.xml --log=xbt_cfg.thresh:warning -np 3 --cfg=model-check:1 --cfg=smpi/running_power:1e9 --cfg=smpi/coll_selector:mpich ${bindir:=.}/collective-misorder --log=smpi_coll.thresh:error
 > [0.000000] [mc_safety/INFO] Check a safety property
 > (0) is alive on Tremblay
index 44a992c..676481d 100644 (file)
@@ -1,6 +1,7 @@
 #! ./tesh
 
-! expect return 134
+! expect return 3
+! output display
 $ ${bindir:=.}/../../../../bin/smpirun -wrapper "${bindir:=.}/../../../../bin/simgrid-mc" -hostfile ../../hostfile -platform ../../../../examples/platforms/small_platform.xml --log=xbt_cfg.thresh:warning -np 3 --cfg=model-check:1 --cfg=smpi/running_power:1e9 --cfg=smpi/coll_selector:mpich ${bindir:=.}/complex-deadlock --log=smpi_coll.thresh:error
 > [0.000000] [mc_safety/INFO] Check a safety property
 > (0) is alive on Tremblay
index 554d81a..0abb0f2 100644 (file)
@@ -1,6 +1,7 @@
 #! ./tesh
 
-! expect return 134
+! expect return 3
+! output display
 $ ${bindir:=.}/../../../../bin/smpirun -wrapper "${bindir:=.}/../../../../bin/simgrid-mc" -hostfile ../../hostfile -platform ../../../../examples/platforms/small_platform.xml --log=xbt_cfg.thresh:warning -np 3 --cfg=model-check:1 --cfg=smpi/running_power:1e9 --cfg=smpi/coll_selector:mpich ${bindir:=.}/deadlock-config --log=smpi_coll.thresh:error
 > [0.000000] [mc_safety/INFO] Check a safety property
 > WARNING: This test depends on the MPI's eager limit. Set it appropriately.
index ed23519..1acaa50 100644 (file)
@@ -1,6 +1,7 @@
 #! ./tesh
 
-! expect return 134
+! expect return 3
+! output display
 $ ${bindir:=.}/../../../../bin/smpirun -wrapper "${bindir:=.}/../../../../bin/simgrid-mc" -hostfile ../../hostfile -platform ../../../../examples/platforms/small_platform.xml --log=xbt_cfg.thresh:warning -np 3 --cfg=model-check:1 --cfg=smpi/running_power:1e9 --cfg=smpi/coll_selector:mpich ${bindir:=.}/finalize-deadlock --log=smpi_coll.thresh:error
 > [0.000000] [mc_safety/INFO] Check a safety property
 > (0) is alive on Tremblay
index 5dfc37b..2f9fb4c 100644 (file)
@@ -1,6 +1,7 @@
 #! ./tesh
 
-! expect return 134
+! expect return 3
+! output display
 $ ${bindir:=.}/../../../../bin/smpirun -wrapper "${bindir:=.}/../../../../bin/simgrid-mc" -hostfile ../../hostfile -platform ../../../../examples/platforms/small_platform.xml --log=xbt_cfg.thresh:warning -np 3 --cfg=model-check:1 --cfg=smpi/running_power:1e9 --cfg=smpi/coll_selector:mpich ${bindir:=.}/irecv-deadlock --log=smpi_coll.thresh:error
 > [0.000000] [mc_safety/INFO] Check a safety property
 > (0) is alive on Tremblay
index 8557e40..f180198 100644 (file)
@@ -1,6 +1,8 @@
 #! ./tesh
 
-! expect return 134
+! timeout 5
+! expect return 0
+! output display
 $ ${bindir:=.}/../../../../bin/smpirun -wrapper "${bindir:=.}/../../../../bin/simgrid-mc" -hostfile ../../hostfile -platform ../../../../examples/platforms/small_platform.xml --log=xbt_cfg.thresh:warning -np 3 --cfg=model-check:1 --cfg=smpi/running_power:1e9 --cfg=smpi/coll_selector:mpich ${bindir:=.}/no-error --log=smpi_coll.thresh:error
 > [0.000000] [mc_safety/INFO] Check a safety property
 > (0) is alive on Tremblay
index 3846fb2..dcfd5d4 100644 (file)
@@ -1,6 +1,8 @@
 #! ./tesh
 
-! expect return 134
+! timeout 5
+! expect return 0
+! output display
 $ ${bindir:=.}/../../../../bin/smpirun -wrapper "${bindir:=.}/../../../../bin/simgrid-mc" -hostfile ../../hostfile -platform ../../../../examples/platforms/small_platform.xml --log=xbt_cfg.thresh:warning -np 3 --cfg=model-check:1 --cfg=smpi/running_power:1e9 --cfg=smpi/coll_selector:mpich ${bindir:=.}/no-error2 --log=smpi_coll.thresh:error
 > [0.000000] [mc_safety/INFO] Check a safety property
 > (0) is alive on Tremblay
index f69b6c8..07e0b79 100644 (file)
@@ -1,6 +1,8 @@
 #! ./tesh
 
-! expect return 134
+! timeout 5
+! expect return 0
+! output display
 $ ${bindir:=.}/../../../../bin/smpirun -wrapper "${bindir:=.}/../../../../bin/simgrid-mc" -hostfile ../../hostfile -platform ../../../../examples/platforms/small_platform.xml --log=xbt_cfg.thresh:warning -np 3 --cfg=model-check:1 --cfg=smpi/running_power:1e9 --cfg=smpi/coll_selector:mpich ${bindir:=.}/no-error3-any_src --log=smpi_coll.thresh:error
 > [0.000000] [mc_safety/INFO] Check a safety property
 > (0) is alive on Tremblay
index ccd84af..b5dd11b 100644 (file)
@@ -1,6 +1,8 @@
 #! ./tesh
 
-! expect return 134
+! timeout 5
+! expect return 0
+! output display
 $ ${bindir:=.}/../../../../bin/smpirun -wrapper "${bindir:=.}/../../../../bin/simgrid-mc" -hostfile ../../hostfile -platform ../../../../examples/platforms/small_platform.xml --log=xbt_cfg.thresh:warning -np 3 --cfg=model-check:1 --cfg=smpi/running_power:1e9 --cfg=smpi/coll_selector:mpich ${bindir:=.}/no-error3 --log=smpi_coll.thresh:error
 > [0.000000] [mc_safety/INFO] Check a safety property
 > (0) is alive on Tremblay