activate working tests

Lower sizes and number of messages for pingping to avoid taking too long

diff --git a/buildtools/Cmake/AddTests.cmake b/buildtools/Cmake/AddTests.cmake
index 9dea8e7..4214b84 100644 (file)
--- a/buildtools/Cmake/AddTests.cmake
+++ b/buildtools/Cmake/AddTests.cmake
@@ -425,7 +425,7 @@ IF(NOT enable_memcheck)
         ADD_TEST(test-smpi-mpich3-init-raw       ${CMAKE_COMMAND} -E chdir ${CMAKE_BINARY_DIR}/teshsuite/smpi/mpich3-test/init perl ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/runtests -mpiexec=${CMAKE_BINARY_DIR}/smpi_script/bin/smpirun -srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/init -tests=testlist -execarg=--cfg=contexts/factory:raw)
         ADD_TEST(test-smpi-mpich3-datatype-raw   ${CMAKE_COMMAND} -E chdir ${CMAKE_BINARY_DIR}/teshsuite/smpi/mpich3-test/datatype perl ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/runtests -mpiexec=${CMAKE_BINARY_DIR}/smpi_script/bin/smpirun -srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/datatype -tests=testlist -execarg=--cfg=contexts/factory:raw)
         ADD_TEST(test-smpi-mpich3-group-raw      ${CMAKE_COMMAND} -E chdir ${CMAKE_BINARY_DIR}/teshsuite/smpi/mpich3-test/group perl ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/runtests -mpiexec=${CMAKE_BINARY_DIR}/smpi_script/bin/smpirun -srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/group -tests=testlist -execarg=--cfg=contexts/factory:raw)
-        ADD_TEST(test-smpi-mpich3-pt2pt-raw      ${CMAKE_COMMAND} -E chdir ${CMAKE_BINARY_DIR}/teshsuite/smpi/mpich3-test/pt2pt perl ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/runtests -mpiexec=${CMAKE_BINARY_DIR}/smpi_script/bin/smpirun -srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/pt2pt -tests=testlist -execarg=--cfg=contexts/factory:raw)
+        ADD_TEST(test-smpi-mpich3-pt2pt-raw      ${CMAKE_COMMAND} -E chdir ${CMAKE_BINARY_DIR}/teshsuite/smpi/mpich3-test/pt2pt perl ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/runtests -mpiexec=${CMAKE_BINARY_DIR}/smpi_script/bin/smpirun -srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/pt2pt -tests=testlist -execarg=--cfg=contexts/factory:raw -execarg=--cfg=smpi/privatize_global_variables:yes)
         ADD_TEST(test-smpi-mpich3-topo-raw       ${CMAKE_COMMAND} -E chdir ${CMAKE_BINARY_DIR}/teshsuite/smpi/mpich3-test/topo perl ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/runtests -mpiexec=${CMAKE_BINARY_DIR}/smpi_script/bin/smpirun -srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/topo -tests=testlist -execarg=--cfg=contexts/factory:raw)
         ADD_TEST(test-smpi-mpich3-rma-raw       ${CMAKE_COMMAND} -E chdir ${CMAKE_BINARY_DIR}/teshsuite/smpi/mpich3-test/rma perl ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/runtests -mpiexec=${CMAKE_BINARY_DIR}/smpi_script/bin/smpirun -srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/rma -tests=testlist -execarg=--cfg=contexts/factory:raw -execarg=--cfg=smpi/privatize_global_variables:yes)
         SET_TESTS_PROPERTIES(test-smpi-mpich3-attr-raw test-smpi-mpich3-comm-raw test-smpi-mpich3-init-raw test-smpi-mpich3-datatype-raw test-smpi-mpich3-group-raw test-smpi-mpich3-pt2pt-raw test-smpi-mpich3-topo-raw test-smpi-mpich3-rma-raw PROPERTIES PASS_REGULAR_EXPRESSION "tests passed!")

diff --git a/teshsuite/smpi/mpich3-test/pt2pt/CMakeLists.txt b/teshsuite/smpi/mpich3-test/pt2pt/CMakeLists.txt
index 01f8aaf..fc21ef3 100644 (file)
--- a/teshsuite/smpi/mpich3-test/pt2pt/CMakeLists.txt
+++ b/teshsuite/smpi/mpich3-test/pt2pt/CMakeLists.txt
@@ -31,7 +31,7 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite)
   add_executable(isendselfprobe isendselfprobe.c)
 #  add_executable(large_message large_message.c)
   add_executable(mprobe mprobe.c)
-#  add_executable(pingping pingping.c)
+  add_executable(pingping pingping.c)
   add_executable(probenull probenull.c)
   add_executable(probe-unexp probe-unexp.c)
 #  add_executable(pscancel pscancel.c)
@@ -42,7 +42,7 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite)
 #  add_executable(scancel scancel.c)
   add_executable(sendall sendall.c)
   add_executable(sendflood sendflood.c)
-#  add_executable(sendrecv1 sendrecv1.c)
+  add_executable(sendrecv1 sendrecv1.c)
   add_executable(sendrecv2 sendrecv2.c)
   add_executable(sendrecv3 sendrecv3.c)
 #  add_executable(sendself sendself.c)
@@ -68,7 +68,7 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite)
   target_link_libraries(isendselfprobe simgrid mtest_c)
 #  target_link_libraries(large_message simgrid mtest_c)
   target_link_libraries(mprobe simgrid mtest_c)
-#  target_link_libraries(pingping simgrid mtest_c)
+  target_link_libraries(pingping simgrid mtest_c)
   target_link_libraries(probenull simgrid mtest_c)
   target_link_libraries(probe-unexp simgrid mtest_c)
 #  target_link_libraries(pscancel simgrid mtest_c)
@@ -79,7 +79,7 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite)
 #  target_link_libraries(scancel simgrid mtest_c)
   target_link_libraries(sendall simgrid mtest_c)
   target_link_libraries(sendflood simgrid mtest_c)
-#  target_link_libraries(sendrecv1 simgrid mtest_c)
+  target_link_libraries(sendrecv1 simgrid mtest_c)
   target_link_libraries(sendrecv2 simgrid mtest_c)
   target_link_libraries(sendrecv3 simgrid mtest_c)
 #  target_link_libraries(sendself simgrid mtest_c)

diff --git a/teshsuite/smpi/mpich3-test/pt2pt/pingping.c b/teshsuite/smpi/mpich3-test/pt2pt/pingping.c
index 95f6e39..e5ca622 100644 (file)
--- a/teshsuite/smpi/mpich3-test/pt2pt/pingping.c
+++ b/teshsuite/smpi/mpich3-test/pt2pt/pingping.c
@@ -12,8 +12,8 @@
 static char MTEST_Descrip[] = "Send flood test";
 */
 
-#define MAX_MSG_SIZE 40000000
-#define MAX_COUNT    4000
+#define MAX_MSG_SIZE 4000000
+#define MAX_COUNT    400
 int main( int argc, char *argv[] )
 {
     int errs = 0, err;

diff --git a/teshsuite/smpi/mpich3-test/pt2pt/testlist b/teshsuite/smpi/mpich3-test/pt2pt/testlist
index 1f16ded..730882b 100644 (file)
--- a/teshsuite/smpi/mpich3-test/pt2pt/testlist
+++ b/teshsuite/smpi/mpich3-test/pt2pt/testlist
@@ -1,5 +1,4 @@
-#needs MPI_Type_dup, MPI_Type_set_name
-#sendrecv1 4
+sendrecv1 4
 sendrecv2 2
 sendrecv3 2
 sendflood 8 timeLimit=600
@@ -8,8 +7,7 @@ sendflood 8 timeLimit=600
 sendall 4
 anyall 2
 eagerdt 2
-#needs MPI_Type_get_name, MPI_Type_dup
-#pingping 2
+pingping 2
 bottom 2
 #needs MPI_Bsend
 #bsend1 1