From 760a15947b3cd7cb39aa8e06a9f5d0b9cbe6159f Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Thu, 1 Oct 2015 18:04:46 +0200 Subject: [PATCH] ISP tests need more time to run. Increase timeout --- teshsuite/smpi/isp/umpire/any_src-can-deadlock10.tesh | 1 + teshsuite/smpi/isp/umpire/any_src-can-deadlock4.tesh | 1 + teshsuite/smpi/isp/umpire/any_src-can-deadlock5.tesh | 1 + teshsuite/smpi/isp/umpire/any_src-can-deadlock6.tesh | 1 + teshsuite/smpi/isp/umpire/any_src-wait-deadlock.tesh | 1 + teshsuite/smpi/isp/umpire/any_src-waitall-deadlock2.tesh | 1 + teshsuite/smpi/isp/umpire/any_src-waitall-deadlock3.tesh | 1 + teshsuite/smpi/isp/umpire/any_src-waitany-deadlock.tesh | 1 + teshsuite/smpi/isp/umpire/any_src-waitany-deadlock2.tesh | 1 + teshsuite/smpi/isp/umpire/basic-deadlock-comm_create.tesh | 1 + teshsuite/smpi/isp/umpire/basic-deadlock-comm_dup.tesh | 1 + teshsuite/smpi/isp/umpire/basic-deadlock-comm_split.tesh | 1 + teshsuite/smpi/isp/umpire/basic-deadlock.tesh | 1 + teshsuite/smpi/isp/umpire/bcast-deadlock.tesh | 1 + teshsuite/smpi/isp/umpire/collective-misorder-allreduce.tesh | 1 + teshsuite/smpi/isp/umpire/collective-misorder.tesh | 1 + teshsuite/smpi/isp/umpire/complex-deadlock.tesh | 1 + teshsuite/smpi/isp/umpire/deadlock-config.tesh | 1 + teshsuite/smpi/isp/umpire/finalize-deadlock.tesh | 1 + teshsuite/smpi/isp/umpire/irecv-deadlock.tesh | 1 + teshsuite/smpi/isp/umpire/no-error.tesh | 2 +- teshsuite/smpi/isp/umpire/no-error2.tesh | 2 +- teshsuite/smpi/isp/umpire/no-error3-any_src.tesh | 2 +- teshsuite/smpi/isp/umpire/no-error3.tesh | 2 +- 24 files changed, 24 insertions(+), 4 deletions(-) diff --git a/teshsuite/smpi/isp/umpire/any_src-can-deadlock10.tesh b/teshsuite/smpi/isp/umpire/any_src-can-deadlock10.tesh index 6bca6c216a..e1c8c4544b 100644 --- a/teshsuite/smpi/isp/umpire/any_src-can-deadlock10.tesh +++ b/teshsuite/smpi/isp/umpire/any_src-can-deadlock10.tesh @@ -1,5 +1,6 @@ #! ./tesh +! timeout 30 ! 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=smpi/running_power:1e9 --cfg=smpi/coll_selector:mpich ${bindir:=.}/any_src-can-deadlock10 --log=smpi_coll.thresh:error diff --git a/teshsuite/smpi/isp/umpire/any_src-can-deadlock4.tesh b/teshsuite/smpi/isp/umpire/any_src-can-deadlock4.tesh index 6abad25318..953361c9cb 100644 --- a/teshsuite/smpi/isp/umpire/any_src-can-deadlock4.tesh +++ b/teshsuite/smpi/isp/umpire/any_src-can-deadlock4.tesh @@ -1,5 +1,6 @@ #! ./tesh +! timeout 30 ! 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=smpi/running_power:1e9 --cfg=smpi/coll_selector:mpich ${bindir:=.}/any_src-can-deadlock4 --log=smpi_coll.thresh:error diff --git a/teshsuite/smpi/isp/umpire/any_src-can-deadlock5.tesh b/teshsuite/smpi/isp/umpire/any_src-can-deadlock5.tesh index d766281d8c..dc26e237c2 100644 --- a/teshsuite/smpi/isp/umpire/any_src-can-deadlock5.tesh +++ b/teshsuite/smpi/isp/umpire/any_src-can-deadlock5.tesh @@ -1,5 +1,6 @@ #! ./tesh +! timeout 30 ! expect return 3 ! output display $ ${bindir:=.}/../../../../bin/smpirun -wrapper "${bindir:=.}/../../../../bin/simgrid-mc" -hostfile ../../hostfile -platform ../../../../examples/platforms/small_platform.xml -np 3 --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 diff --git a/teshsuite/smpi/isp/umpire/any_src-can-deadlock6.tesh b/teshsuite/smpi/isp/umpire/any_src-can-deadlock6.tesh index 1a06b940ca..3e860c863f 100644 --- a/teshsuite/smpi/isp/umpire/any_src-can-deadlock6.tesh +++ b/teshsuite/smpi/isp/umpire/any_src-can-deadlock6.tesh @@ -1,5 +1,6 @@ #! ./tesh +! timeout 30 ! 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=smpi/running_power:1e9 --cfg=smpi/coll_selector:mpich ${bindir:=.}/any_src-can-deadlock6 --log=smpi_coll.thresh:error diff --git a/teshsuite/smpi/isp/umpire/any_src-wait-deadlock.tesh b/teshsuite/smpi/isp/umpire/any_src-wait-deadlock.tesh index 5fb1af8262..7b46a24a94 100644 --- a/teshsuite/smpi/isp/umpire/any_src-wait-deadlock.tesh +++ b/teshsuite/smpi/isp/umpire/any_src-wait-deadlock.tesh @@ -1,5 +1,6 @@ #! ./tesh +! timeout 30 ! 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=smpi/running_power:1e9 --cfg=smpi/coll_selector:mpich ${bindir:=.}/any_src-wait-deadlock --log=smpi_coll.thresh:error diff --git a/teshsuite/smpi/isp/umpire/any_src-waitall-deadlock2.tesh b/teshsuite/smpi/isp/umpire/any_src-waitall-deadlock2.tesh index e49ba9e153..0232c4e8ad 100644 --- a/teshsuite/smpi/isp/umpire/any_src-waitall-deadlock2.tesh +++ b/teshsuite/smpi/isp/umpire/any_src-waitall-deadlock2.tesh @@ -1,5 +1,6 @@ #! ./tesh +! timeout 30 ! 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=smpi/running_power:1e9 --cfg=smpi/coll_selector:mpich ${bindir:=.}/any_src-waitall-deadlock2 --log=smpi_coll.thresh:error diff --git a/teshsuite/smpi/isp/umpire/any_src-waitall-deadlock3.tesh b/teshsuite/smpi/isp/umpire/any_src-waitall-deadlock3.tesh index f12154ce04..ef536d73a1 100644 --- a/teshsuite/smpi/isp/umpire/any_src-waitall-deadlock3.tesh +++ b/teshsuite/smpi/isp/umpire/any_src-waitall-deadlock3.tesh @@ -1,5 +1,6 @@ #! ./tesh +! timeout 30 ! 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=smpi/running_power:1e9 --cfg=smpi/coll_selector:mpich ${bindir:=.}/any_src-waitall-deadlock3 --log=smpi_coll.thresh:error diff --git a/teshsuite/smpi/isp/umpire/any_src-waitany-deadlock.tesh b/teshsuite/smpi/isp/umpire/any_src-waitany-deadlock.tesh index b0ff7b85fc..3d27e9315f 100644 --- a/teshsuite/smpi/isp/umpire/any_src-waitany-deadlock.tesh +++ b/teshsuite/smpi/isp/umpire/any_src-waitany-deadlock.tesh @@ -1,5 +1,6 @@ #! ./tesh +! timeout 30 ! 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=smpi/running_power:1e9 --cfg=smpi/coll_selector:mpich ${bindir:=.}/any_src-waitany-deadlock --log=smpi_coll.thresh:error diff --git a/teshsuite/smpi/isp/umpire/any_src-waitany-deadlock2.tesh b/teshsuite/smpi/isp/umpire/any_src-waitany-deadlock2.tesh index 44aef2f43f..cd966d4a8d 100644 --- a/teshsuite/smpi/isp/umpire/any_src-waitany-deadlock2.tesh +++ b/teshsuite/smpi/isp/umpire/any_src-waitany-deadlock2.tesh @@ -1,5 +1,6 @@ #! ./tesh +! timeout 30 ! 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=smpi/running_power:1e9 --cfg=smpi/coll_selector:mpich ${bindir:=.}/any_src-waitany-deadlock2 --log=smpi_coll.thresh:error diff --git a/teshsuite/smpi/isp/umpire/basic-deadlock-comm_create.tesh b/teshsuite/smpi/isp/umpire/basic-deadlock-comm_create.tesh index 40dec6650d..b760309840 100644 --- a/teshsuite/smpi/isp/umpire/basic-deadlock-comm_create.tesh +++ b/teshsuite/smpi/isp/umpire/basic-deadlock-comm_create.tesh @@ -1,5 +1,6 @@ #! ./tesh +! timeout 30 ! 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=smpi/running_power:1e9 --cfg=smpi/coll_selector:mpich ${bindir:=.}/basic-deadlock-comm_create --log=smpi_coll.thresh:error diff --git a/teshsuite/smpi/isp/umpire/basic-deadlock-comm_dup.tesh b/teshsuite/smpi/isp/umpire/basic-deadlock-comm_dup.tesh index 322e94021d..b7cb405e60 100644 --- a/teshsuite/smpi/isp/umpire/basic-deadlock-comm_dup.tesh +++ b/teshsuite/smpi/isp/umpire/basic-deadlock-comm_dup.tesh @@ -1,5 +1,6 @@ #! ./tesh +! timeout 30 ! 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=smpi/running_power:1e9 --cfg=smpi/coll_selector:mpich ${bindir:=.}/basic-deadlock-comm_dup --log=smpi_coll.thresh:error diff --git a/teshsuite/smpi/isp/umpire/basic-deadlock-comm_split.tesh b/teshsuite/smpi/isp/umpire/basic-deadlock-comm_split.tesh index d1047963b6..4a50677be7 100644 --- a/teshsuite/smpi/isp/umpire/basic-deadlock-comm_split.tesh +++ b/teshsuite/smpi/isp/umpire/basic-deadlock-comm_split.tesh @@ -1,5 +1,6 @@ #! ./tesh +! timeout 30 ! 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=smpi/running_power:1e9 --cfg=smpi/coll_selector:mpich ${bindir:=.}/basic-deadlock-comm_split --log=smpi_coll.thresh:error diff --git a/teshsuite/smpi/isp/umpire/basic-deadlock.tesh b/teshsuite/smpi/isp/umpire/basic-deadlock.tesh index e385462fcd..6573a11a53 100644 --- a/teshsuite/smpi/isp/umpire/basic-deadlock.tesh +++ b/teshsuite/smpi/isp/umpire/basic-deadlock.tesh @@ -1,5 +1,6 @@ #! ./tesh +! timeout 30 ! 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=smpi/running_power:1e9 --cfg=smpi/coll_selector:mpich ${bindir:=.}/basic-deadlock --log=smpi_coll.thresh:error diff --git a/teshsuite/smpi/isp/umpire/bcast-deadlock.tesh b/teshsuite/smpi/isp/umpire/bcast-deadlock.tesh index 88d54fa21f..34fab60c27 100644 --- a/teshsuite/smpi/isp/umpire/bcast-deadlock.tesh +++ b/teshsuite/smpi/isp/umpire/bcast-deadlock.tesh @@ -1,5 +1,6 @@ #! ./tesh +! timeout 30 ! 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=smpi/running_power:1e9 --cfg=smpi/coll_selector:mpich ${bindir:=.}/bcast-deadlock --log=smpi_coll.thresh:error diff --git a/teshsuite/smpi/isp/umpire/collective-misorder-allreduce.tesh b/teshsuite/smpi/isp/umpire/collective-misorder-allreduce.tesh index 2718635e00..e09393813f 100644 --- a/teshsuite/smpi/isp/umpire/collective-misorder-allreduce.tesh +++ b/teshsuite/smpi/isp/umpire/collective-misorder-allreduce.tesh @@ -1,5 +1,6 @@ #! ./tesh +! timeout 30 ! 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=smpi/running_power:1e9 --cfg=smpi/coll_selector:mpich ${bindir:=.}/collective-misorder-allreduce --log=smpi_coll.thresh:error diff --git a/teshsuite/smpi/isp/umpire/collective-misorder.tesh b/teshsuite/smpi/isp/umpire/collective-misorder.tesh index beb811340e..c4f7128bfa 100644 --- a/teshsuite/smpi/isp/umpire/collective-misorder.tesh +++ b/teshsuite/smpi/isp/umpire/collective-misorder.tesh @@ -1,5 +1,6 @@ #! ./tesh +! timeout 30 ! 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=smpi/running_power:1e9 --cfg=smpi/coll_selector:mpich ${bindir:=.}/collective-misorder --log=smpi_coll.thresh:error diff --git a/teshsuite/smpi/isp/umpire/complex-deadlock.tesh b/teshsuite/smpi/isp/umpire/complex-deadlock.tesh index e8ffb48195..849df7ad8f 100644 --- a/teshsuite/smpi/isp/umpire/complex-deadlock.tesh +++ b/teshsuite/smpi/isp/umpire/complex-deadlock.tesh @@ -1,5 +1,6 @@ #! ./tesh +! timeout 30 ! 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=smpi/running_power:1e9 --cfg=smpi/coll_selector:mpich ${bindir:=.}/complex-deadlock --log=smpi_coll.thresh:error diff --git a/teshsuite/smpi/isp/umpire/deadlock-config.tesh b/teshsuite/smpi/isp/umpire/deadlock-config.tesh index 1418b5139e..73bc83247e 100644 --- a/teshsuite/smpi/isp/umpire/deadlock-config.tesh +++ b/teshsuite/smpi/isp/umpire/deadlock-config.tesh @@ -1,5 +1,6 @@ #! ./tesh +! timeout 30 ! 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=smpi/running_power:1e9 --cfg=smpi/coll_selector:mpich ${bindir:=.}/deadlock-config --log=smpi_coll.thresh:error diff --git a/teshsuite/smpi/isp/umpire/finalize-deadlock.tesh b/teshsuite/smpi/isp/umpire/finalize-deadlock.tesh index 98ee500b95..a48e2696e8 100644 --- a/teshsuite/smpi/isp/umpire/finalize-deadlock.tesh +++ b/teshsuite/smpi/isp/umpire/finalize-deadlock.tesh @@ -1,5 +1,6 @@ #! ./tesh +! timeout 30 ! 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=smpi/running_power:1e9 --cfg=smpi/coll_selector:mpich ${bindir:=.}/finalize-deadlock --log=smpi_coll.thresh:error diff --git a/teshsuite/smpi/isp/umpire/irecv-deadlock.tesh b/teshsuite/smpi/isp/umpire/irecv-deadlock.tesh index db17d2498e..92675e0a13 100644 --- a/teshsuite/smpi/isp/umpire/irecv-deadlock.tesh +++ b/teshsuite/smpi/isp/umpire/irecv-deadlock.tesh @@ -1,5 +1,6 @@ #! ./tesh +! timeout 30 ! 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=smpi/running_power:1e9 --cfg=smpi/coll_selector:mpich ${bindir:=.}/irecv-deadlock --log=smpi_coll.thresh:error diff --git a/teshsuite/smpi/isp/umpire/no-error.tesh b/teshsuite/smpi/isp/umpire/no-error.tesh index 23360e11d5..4efb16f403 100644 --- a/teshsuite/smpi/isp/umpire/no-error.tesh +++ b/teshsuite/smpi/isp/umpire/no-error.tesh @@ -1,6 +1,6 @@ #! ./tesh -! timeout 5 +! timeout 30 ! 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=smpi/running_power:1e9 --cfg=smpi/coll_selector:mpich ${bindir:=.}/no-error --log=smpi_coll.thresh:error diff --git a/teshsuite/smpi/isp/umpire/no-error2.tesh b/teshsuite/smpi/isp/umpire/no-error2.tesh index 930224c7dd..a5db7cbdc5 100644 --- a/teshsuite/smpi/isp/umpire/no-error2.tesh +++ b/teshsuite/smpi/isp/umpire/no-error2.tesh @@ -1,6 +1,6 @@ #! ./tesh -! timeout 5 +! timeout 30 ! 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=smpi/running_power:1e9 --cfg=smpi/coll_selector:mpich ${bindir:=.}/no-error2 --log=smpi_coll.thresh:error diff --git a/teshsuite/smpi/isp/umpire/no-error3-any_src.tesh b/teshsuite/smpi/isp/umpire/no-error3-any_src.tesh index 88131d38c6..620268f654 100644 --- a/teshsuite/smpi/isp/umpire/no-error3-any_src.tesh +++ b/teshsuite/smpi/isp/umpire/no-error3-any_src.tesh @@ -1,6 +1,6 @@ #! ./tesh -! timeout 5 +! timeout 30 ! 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=smpi/running_power:1e9 --cfg=smpi/coll_selector:mpich ${bindir:=.}/no-error3-any_src --log=smpi_coll.thresh:error diff --git a/teshsuite/smpi/isp/umpire/no-error3.tesh b/teshsuite/smpi/isp/umpire/no-error3.tesh index 68eaca0818..b43d547fdd 100644 --- a/teshsuite/smpi/isp/umpire/no-error3.tesh +++ b/teshsuite/smpi/isp/umpire/no-error3.tesh @@ -1,6 +1,6 @@ #! ./tesh -! timeout 5 +! timeout 30 ! 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=smpi/running_power:1e9 --cfg=smpi/coll_selector:mpich ${bindir:=.}/no-error3 --log=smpi_coll.thresh:error -- 2.20.1