activate tests for subarrays

diff --git a/teshsuite/smpi/mpich3-test/datatype/CMakeLists.txt b/teshsuite/smpi/mpich3-test/datatype/CMakeLists.txt
index b4bf519..0064994 100644 (file)
--- a/teshsuite/smpi/mpich3-test/datatype/CMakeLists.txt
+++ b/teshsuite/smpi/mpich3-test/datatype/CMakeLists.txt
@@ -12,7 +12,8 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite)
   foreach(file blockindexed-zero-count contigstruct contig-zero-count cxx-types dataalign gaddress hindexed_block
           hindexed_block_contents hvecblklen large_vec localpack longdouble simple-commit simple-pack simple-resized simple-size-extent
           struct-derived-zeros struct-ezhov struct-pack struct-verydeep struct-zero-count tfree transpose-pack tresized2
   foreach(file blockindexed-zero-count contigstruct contig-zero-count cxx-types dataalign gaddress hindexed_block
           hindexed_block_contents hvecblklen large_vec localpack longdouble simple-commit simple-pack simple-resized simple-size-extent
           struct-derived-zeros struct-ezhov struct-pack struct-verydeep struct-zero-count tfree transpose-pack tresized2

-          tresized typecommit typefree typelb typename unpack vecblklen zeroblks zeroparms)
+          tresized typecommit typefree typelb typename unpack vecblklen zeroblks zeroparms
+          subarray subarray-pack)

     # not compiled files
     # blockindexed-misc contents darray-cyclic darray-pack get-elements get-elements-pairtype getpartelm get-struct
     # hindexed-zeros indexed-misc large-count large_type large_type_sendrec lbub lots-of-type pairtype-pack
     # not compiled files
     # blockindexed-misc contents darray-cyclic darray-pack get-elements get-elements-pairtype getpartelm get-struct
     # hindexed-zeros indexed-misc large-count large_type large_type_sendrec lbub lots-of-type pairtype-pack

diff --git a/teshsuite/smpi/mpich3-test/datatype/subarray-pack.c b/teshsuite/smpi/mpich3-test/datatype/subarray-pack.c
index aa73700..09338a7 100644 (file)
--- a/teshsuite/smpi/mpich3-test/datatype/subarray-pack.c
+++ b/teshsuite/smpi/mpich3-test/datatype/subarray-pack.c
@@ -8,7 +8,7 @@
 #include <stdlib.h>
 #include <string.h>
 
 #include <stdlib.h>
 #include <string.h>
 

-static int verbose = 0;
+static int verbose = 1;

 
 /* tests */
 int subarray_1d_c_test1(void);
 
 /* tests */
 int subarray_1d_c_test1(void);

diff --git a/teshsuite/smpi/mpich3-test/datatype/testlist b/teshsuite/smpi/mpich3-test/datatype/testlist
index c084bb3..98fb32c 100644 (file)
--- a/teshsuite/smpi/mpich3-test/datatype/testlist
+++ b/teshsuite/smpi/mpich3-test/datatype/testlist
@@ -31,9 +31,8 @@ blockindexed-zero-count 1
 #needs better handling of lb/ub
 #blockindexed-misc 1
 #indexed-misc 1
 #needs better handling of lb/ub
 #blockindexed-misc 1
 #indexed-misc 1

-#needs MPI_Type_create_subarray
-#subarray-pack 1
-#subarray 2
+subarray-pack 1
+subarray 2

 #needs MPI_Type_create_darray
 #darray-pack 1
 #darray-pack 9
 #needs MPI_Type_create_darray
 #darray-pack 1
 #darray-pack 9

diff --git a/teshsuite/smpi/mpich3-test/f77/datatype/CMakeLists.txt b/teshsuite/smpi/mpich3-test/f77/datatype/CMakeLists.txt
index bda4c89..330fd1f 100644 (file)
--- a/teshsuite/smpi/mpich3-test/f77/datatype/CMakeLists.txt
+++ b/teshsuite/smpi/mpich3-test/f77/datatype/CMakeLists.txt
@@ -21,7 +21,7 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite AND SMPI_FORTRAN)
 #  add_executable(typename3f typename3f.f)
 #  add_executable(typenamef typenamef.f)
 #  add_executable(typesnamef typesnamef.f)
 #  add_executable(typename3f typename3f.f)
 #  add_executable(typenamef typenamef.f)
 #  add_executable(typesnamef typesnamef.f)

-#  add_executable(typesubf typesubf.f)
+  add_executable(typesubf typesubf.f)

 
 #  target_link_libraries(allctypesf simgrid mtest_f77)
   target_link_libraries(gaddressf simgrid mtest_f77)
 
 #  target_link_libraries(allctypesf simgrid mtest_f77)
   target_link_libraries(gaddressf simgrid mtest_f77)


@@ -33,7 +33,7 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite AND SMPI_FORTRAN)
 #  target_link_libraries(typename3f simgrid mtest_f77)
 #  target_link_libraries(typenamef simgrid mtest_f77)
 #  target_link_libraries(typesnamef simgrid mtest_f77)
 #  target_link_libraries(typename3f simgrid mtest_f77)
 #  target_link_libraries(typenamef simgrid mtest_f77)
 #  target_link_libraries(typesnamef simgrid mtest_f77)

-#  target_link_libraries(typesubf simgrid mtest_f77)
+  target_link_libraries(typesubf simgrid mtest_f77)

 endif()
 
 set(examples_src
 endif()
 
 set(examples_src

diff --git a/teshsuite/smpi/mpich3-test/f77/datatype/testlist b/teshsuite/smpi/mpich3-test/f77/datatype/testlist
index 5da0524..a9e8dcd 100644 (file)
--- a/teshsuite/smpi/mpich3-test/f77/datatype/testlist
+++ b/teshsuite/smpi/mpich3-test/f77/datatype/testlist
@@ -3,7 +3,7 @@
 #typesnamef 1
 #typecntsf 1
 #typem2f 1
 #typesnamef 1
 #typecntsf 1
 #typem2f 1

-#typesubf 1
+typesubf 1

 #packef 1
 gaddressf 1
 #allctypesf 1
 #packef 1
 gaddressf 1
 #allctypesf 1

diff --git a/teshsuite/smpi/mpich3-test/f90/datatype/CMakeLists.txt b/teshsuite/smpi/mpich3-test/f90/datatype/CMakeLists.txt
index e7f7e95..652b019 100644 (file)
--- a/teshsuite/smpi/mpich3-test/f90/datatype/CMakeLists.txt
+++ b/teshsuite/smpi/mpich3-test/f90/datatype/CMakeLists.txt
@@ -26,7 +26,7 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite AND SMPI_FORTRAN)
 #  add_executable(typename3f90 typename3f90.f90)
 #  add_executable(typenamef90 typenamef90.f90)
 #  add_executable(typesnamef90 typesnamef90.f90)
 #  add_executable(typename3f90 typename3f90.f90)
 #  add_executable(typenamef90 typenamef90.f90)
 #  add_executable(typesnamef90 typesnamef90.f90)

-#  add_executable(typesubf90 typesubf90.f90)
+  add_executable(typesubf90 typesubf90.f90)

 #  target_link_libraries(allctypesf90 simgrid mtest_f90)
  # target_link_libraries(createf90 simgrid mtest_f90)
   target_link_libraries(gaddressf90 simgrid mtest_f90)
 #  target_link_libraries(allctypesf90 simgrid mtest_f90)
  # target_link_libraries(createf90 simgrid mtest_f90)
   target_link_libraries(gaddressf90 simgrid mtest_f90)


@@ -45,7 +45,7 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite AND SMPI_FORTRAN)
 #  target_link_libraries(typename3f90 simgrid mtest_f90)
 #  target_link_libraries(typenamef90 simgrid mtest_f90)
 #  target_link_libraries(typesnamef90 simgrid mtest_f90)
 #  target_link_libraries(typename3f90 simgrid mtest_f90)
 #  target_link_libraries(typenamef90 simgrid mtest_f90)
 #  target_link_libraries(typesnamef90 simgrid mtest_f90)

-#  target_link_libraries(typesubf90 simgrid mtest_f90)
+  target_link_libraries(typesubf90 simgrid mtest_f90)

 endif()
 
 set(examples_src
 endif()
 
 set(examples_src

diff --git a/teshsuite/smpi/mpich3-test/f90/datatype/testlist b/teshsuite/smpi/mpich3-test/f90/datatype/testlist
index 715c66a..5b158a0 100644 (file)
--- a/teshsuite/smpi/mpich3-test/f90/datatype/testlist
+++ b/teshsuite/smpi/mpich3-test/f90/datatype/testlist
@@ -4,7 +4,7 @@
 #typesnamef90 1
 #typecntsf90 1
 #typem2f90 1
 #typesnamef90 1
 #typecntsf90 1
 #typem2f90 1

-#typesubf90 1
+typesubf90 1

 #packef90 1
 gaddressf90 1
 #allctypesf90 1
 #packef90 1
 gaddressf90 1
 #allctypesf90 1