add some tests about the smpi robustness to PEBKAC

diff --git a/.gitignore b/.gitignore
index 9d3fced..af8a049 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -235,9 +235,7 @@ teshsuite/bug-17132/bug-17132
 teshsuite/smpi/bcast/bcast_coll
 teshsuite/smpi/compute/compute2
 teshsuite/smpi/compute/compute3
 teshsuite/smpi/bcast/bcast_coll
 teshsuite/smpi/compute/compute2
 teshsuite/smpi/compute/compute3

-teshsuite/smpi/pingpong/broken_hostfiles.tesh

 teshsuite/smpi/pingpong/dsend
 teshsuite/smpi/pingpong/dsend

-teshsuite/smpi/pingpong/empty-hostfile.txt

 teshsuite/smpi/pingpong/tmpkkndqe
 teshsuite/smpi/reduce/reduce_coll
 teshsuite/smpi/reduce/reduce_scatter_coll
 teshsuite/smpi/pingpong/tmpkkndqe
 teshsuite/smpi/reduce/reduce_coll
 teshsuite/smpi/reduce/reduce_scatter_coll

diff --git a/buildtools/Cmake/AddTests.cmake b/buildtools/Cmake/AddTests.cmake
index e902b7e..3435a49 100644 (file)
--- a/buildtools/Cmake/AddTests.cmake
+++ b/buildtools/Cmake/AddTests.cmake
@@ -337,6 +337,8 @@ IF(NOT enable_memcheck)
   ### SMPI ###
   IF(enable_smpi)
     # BEGIN TESH TESTS
   ### SMPI ###
   IF(enable_smpi)
     # BEGIN TESH TESTS

+    # smpi broken usage
+    ADD_TESH_FACTORIES(tesh-smpi-broken          "thread"              --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/smpi/pingpong --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/pingpong broken_hostfiles.tesh)

     # smpi examples
     ADD_TESH_FACTORIES(tesh-smpi-bcast           "thread;ucontext;raw" --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/smpi/bcast --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/bcast bcast.tesh)
     ADD_TESH_FACTORIES(tesh-smpi-reduce          "thread;ucontext;raw" --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/smpi/reduce --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/reduce reduce.tesh)
     # smpi examples
     ADD_TESH_FACTORIES(tesh-smpi-bcast           "thread;ucontext;raw" --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/smpi/bcast --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/bcast bcast.tesh)
     ADD_TESH_FACTORIES(tesh-smpi-reduce          "thread;ucontext;raw" --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/smpi/reduce --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/reduce reduce.tesh)

diff --git a/teshsuite/smpi/pingpong/CMakeLists.txt b/teshsuite/smpi/pingpong/CMakeLists.txt
index a7e1547..f1f3c9a 100644 (file)
--- a/teshsuite/smpi/pingpong/CMakeLists.txt
+++ b/teshsuite/smpi/pingpong/CMakeLists.txt
@@ -21,6 +21,8 @@ set(tesh_files
   ${tesh_files}
   ${CMAKE_CURRENT_SOURCE_DIR}/pt2pt.tesh
   ${CMAKE_CURRENT_SOURCE_DIR}/TI_output.tesh
   ${tesh_files}
   ${CMAKE_CURRENT_SOURCE_DIR}/pt2pt.tesh
   ${CMAKE_CURRENT_SOURCE_DIR}/TI_output.tesh

+  ${CMAKE_CURRENT_SOURCE_DIR}/broken_hostfiles.tesh
+

   PARENT_SCOPE
   )
 set(xml_files
   PARENT_SCOPE
   )
 set(xml_files


@@ -39,6 +41,7 @@ set(bin_files
   )
 set(txt_files
   ${txt_files}
   )
 set(txt_files
   ${txt_files}

+  ${CMAKE_CURRENT_SOURCE_DIR}/empty-hostfile.txt

 
   PARENT_SCOPE
   )
 
   PARENT_SCOPE
   )

diff --git a/teshsuite/smpi/pingpong/broken_hostfiles.tesh b/teshsuite/smpi/pingpong/broken_hostfiles.tesh
new file mode 100644 (file)
index 0000000..8783040
--- /dev/null
+++ b/teshsuite/smpi/pingpong/broken_hostfiles.tesh
@@ -0,0 +1,8 @@
+! setenv LD_LIBRARY_PATH=../../lib
+! expect return 1
+$ ${bindir:=.}/../../../bin/smpirun -hostfile empty-hostfile.txt          -platform ../../../examples/msg/small_platform.xml -np 4 ${bindir:=.}/pingpong -q --log=smpi_kernel.thres:warning
+> [smpirun] ** error: the hostfile 'empty-hostfile.txt' is empty. Aborting.
+
+! expect return 1
+$ ${bindir:=.}/../../../bin/smpirun -hostfile hostfile-does-not-exist.txt -platform ../../../examples/msg/small_platform.xml -np 4 ${bindir:=.}/pingpong -q --log=smpi_kernel.thres:warning
+> [smpirun] ** error: the file 'hostfile-does-not-exist.txt' does not exist. Aborting.

diff --git a/teshsuite/smpi/pingpong/empty-hostfile.txt b/teshsuite/smpi/pingpong/empty-hostfile.txt
new file mode 100644 (file)
index 0000000..e69de29