From 27bb41483deba3f5b13e992a5a2b6b6cf3692e40 Mon Sep 17 00:00:00 2001 From: Bruno Donassolo Date: Thu, 3 Jun 2021 14:40:31 +0200 Subject: [PATCH] Adjust test Empty hostfiles are now checked inside the C++ code, not in smpirun --- .../smpi/pt2pt-pingpong/broken_hostfiles.tesh | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/teshsuite/smpi/pt2pt-pingpong/broken_hostfiles.tesh b/teshsuite/smpi/pt2pt-pingpong/broken_hostfiles.tesh index 69a4b62d2f..f1068a1639 100644 --- a/teshsuite/smpi/pt2pt-pingpong/broken_hostfiles.tesh +++ b/teshsuite/smpi/pt2pt-pingpong/broken_hostfiles.tesh @@ -1,6 +1,14 @@ -! expect return 1 -$ ${bindir:=.}/../../../smpi_script/bin/smpirun -hostfile ../hostfile_empty -platform ${platfdir:=.}/small_platform.xml -np 4 ${bindir:=.}/pt2pt-pingpong -s --log=smpi_config.thres:warning -> [smpirun] ** error: the hostfile '../hostfile_empty' is empty. Aborting. +! ignore Aborted \(core dumped\) +! expect return 134 +$ $VALGRIND_NO_LEAK_CHECK ${bindir:=.}/../../../smpi_script/bin/smpirun -hostfile ../hostfile_empty -quiet -platform ${platfdir:=.}/small_platform.xml -np 4 ${bindir:=.}/pt2pt-pingpong -s --log=smpi_config.thres:warning --log=no_loc +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'smpi/privatization' to '1' +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'smpi/np' to '4' +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'smpi/hostfile' to '../hostfile_empty' +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'surf/precision' to '1e-9' +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'SMPI' +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'smpi/tmpdir' to '/tmp' +> [0.000000] [root/CRITICAL] smpirun: the hostfile '../hostfile_empty' is empty +> Execution failed with code 134. ! expect return 1 $ ${bindir:=.}/../../../smpi_script/bin/smpirun -hostfile hostfile-does-not-exist.txt -platform ${platfdir:=.}/small_platform.xml -np 4 ${bindir:=.}/pt2pt-pingpong -s --log=smpi_config.thres:warning -- 2.20.1