Choose integer size according to MPI_ADDRESS_SIZE.

Same idea as commit fb02e400aa6b82543ea0f6310d230e38f5c2a5e6, but for Fortran77 tests.

diff --git a/.gitignore b/.gitignore
index b2295cc..dbcfa12 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -619,7 +619,7 @@ teshsuite/smpi/mpich3-test/f77/datatype/gaddressf
 teshsuite/smpi/mpich3-test/f77/datatype/hindex1f
 teshsuite/smpi/mpich3-test/f77/datatype/hindexed_blockf
 teshsuite/smpi/mpich3-test/f77/datatype/packef
 teshsuite/smpi/mpich3-test/f77/datatype/hindex1f
 teshsuite/smpi/mpich3-test/f77/datatype/hindexed_blockf
 teshsuite/smpi/mpich3-test/f77/datatype/packef

-teshsuite/smpi/mpich3-test/f77/datatype/typeaints
+teshsuite/smpi/mpich3-test/f77/datatype/typeaints.h

 teshsuite/smpi/mpich3-test/f77/datatype/typecntsf
 teshsuite/smpi/mpich3-test/f77/datatype/typem2f
 teshsuite/smpi/mpich3-test/f77/datatype/typename3f
 teshsuite/smpi/mpich3-test/f77/datatype/typecntsf
 teshsuite/smpi/mpich3-test/f77/datatype/typem2f
 teshsuite/smpi/mpich3-test/f77/datatype/typename3f

diff --git a/teshsuite/smpi/mpich3-test/f77/datatype/CMakeLists.txt b/teshsuite/smpi/mpich3-test/f77/datatype/CMakeLists.txt
index 02dd956..0b7c836 100644 (file)
--- a/teshsuite/smpi/mpich3-test/f77/datatype/CMakeLists.txt
+++ b/teshsuite/smpi/mpich3-test/f77/datatype/CMakeLists.txt
@@ -12,6 +12,8 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite AND SMPI_F2C)
   include_directories("${CMAKE_HOME_DIRECTORY}/include/smpi")
   include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../include/")
 
   include_directories("${CMAKE_HOME_DIRECTORY}/include/smpi")
   include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../include/")
 

+  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/typeaints.h.in ${CMAKE_CURRENT_SOURCE_DIR}/typeaints.h @ONLY)
+

   add_executable(allctypesf allctypesf.f ../util/mtestf.f)
   add_executable(gaddressf gaddressf.f ../util/mtestf.f)
   add_executable(hindex1f hindex1f.f ../util/mtestf.f)
   add_executable(allctypesf allctypesf.f ../util/mtestf.f)
   add_executable(gaddressf gaddressf.f ../util/mtestf.f)
   add_executable(hindex1f hindex1f.f ../util/mtestf.f)


@@ -53,7 +55,7 @@ set(examples_src
   ${CMAKE_CURRENT_SOURCE_DIR}/hindex1f.f
   ${CMAKE_CURRENT_SOURCE_DIR}/hindexed_blockf.f
   ${CMAKE_CURRENT_SOURCE_DIR}/packef.f
   ${CMAKE_CURRENT_SOURCE_DIR}/hindex1f.f
   ${CMAKE_CURRENT_SOURCE_DIR}/hindexed_blockf.f
   ${CMAKE_CURRENT_SOURCE_DIR}/packef.f

-  ${CMAKE_CURRENT_SOURCE_DIR}/typeaints.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/typeaints.h.in

   ${CMAKE_CURRENT_SOURCE_DIR}/typecntsf.f
   ${CMAKE_CURRENT_SOURCE_DIR}/typem2f.f
   ${CMAKE_CURRENT_SOURCE_DIR}/typename3f.f
   ${CMAKE_CURRENT_SOURCE_DIR}/typecntsf.f
   ${CMAKE_CURRENT_SOURCE_DIR}/typem2f.f
   ${CMAKE_CURRENT_SOURCE_DIR}/typename3f.f

diff --git a/teshsuite/smpi/mpich3-test/f77/datatype/typeaints.h b/teshsuite/smpi/mpich3-test/f77/datatype/typeaints.h.in
similarity index 53%
rename from teshsuite/smpi/mpich3-test/f77/datatype/typeaints.h
rename to teshsuite/smpi/mpich3-test/f77/datatype/typeaints.h.in
index ded63b0..5cfae7b 100644 (file)
--- a/teshsuite/smpi/mpich3-test/f77/datatype/typeaints.h
+++ b/teshsuite/smpi/mpich3-test/f77/datatype/typeaints.h.in
@@ -1,6 +1,6 @@
-C -*- Mode: Fortran; -*- 
+C -*- Mode: Fortran; -*-

 C
 C  (C) 2003 by Argonne National Laboratory.
 C      See COPYRIGHT in top-level directory.
 C
 C
 C  (C) 2003 by Argonne National Laboratory.
 C      See COPYRIGHT in top-level directory.
 C

-      integer aint, aintv(max_asizev)
+      integer*@MPI_ADDRESS_SIZE@ aint, aintv(max_asizev)