From: degomme <augustin.degomme@unibas.ch>
Date: Mon, 17 Jul 2017 18:35:58 +0000 (+0200)
Subject: activate new fortran test
X-Git-Tag: v3_17~373
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/3e5973d9db0e6a3b9b53bcd7566645bcacfedbcf

activate new fortran test
---

diff --git a/include/smpi/mpif.h.in b/include/smpi/mpif.h.in
index d6ffa2f444..8af2cdf881 100644
--- a/include/smpi/mpif.h.in
+++ b/include/smpi/mpif.h.in
@@ -82,6 +82,11 @@
       integer MPI_COMM_NULL_DUP_FN, MPI_COMM_DUP_FN
       parameter(MPI_COMM_NULL_DUP_FN =0)
       parameter(MPI_COMM_DUP_FN =0)
+      integer MPI_WIN_NULL_COPY_FN, MPI_WIN_NULL_DELETE_FN
+      parameter(MPI_WIN_NULL_COPY_FN =0)
+      parameter(MPI_WIN_NULL_DELETE_FN =0)
+      integer MPI_WIN_DUP_FN
+      parameter(MPI_WIN_DUP_FN =0)
 
       integer MPI_ROOT, MPI_COMM_TYPE_SHARED
       parameter(MPI_ROOT=0)
@@ -153,6 +158,12 @@
       parameter(MPI_GROUP_EMPTY=-2)
       parameter(MPI_WIN_NULL=-1)
 
+      integer MPI_WIN_BASE, MPI_WIN_SIZE, MPI_WIN_DISP_UNIT
+
+      parameter(MPI_WIN_BASE=-1)
+      parameter(MPI_WIN_SIZE=-2)
+      parameter(MPI_WIN_DISP_UNIT=-3)
+
 ! These IDs have to be unique, consecutive
 ! and ordered as in smpi_f77.cpp. 
       parameter(MPI_COMM_WORLD=0)
diff --git a/teshsuite/smpi/mpich3-test/f77/rma/CMakeLists.txt b/teshsuite/smpi/mpich3-test/f77/rma/CMakeLists.txt
index 5231aa57a9..afd0b85970 100644
--- a/teshsuite/smpi/mpich3-test/f77/rma/CMakeLists.txt
+++ b/teshsuite/smpi/mpich3-test/f77/rma/CMakeLists.txt
@@ -12,7 +12,7 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite AND SMPI_FORTRAN)
   add_executable(winaccf winaccf.f)
 #  add_executable(winerrf winerrf.f)
   add_executable(winfencef winfencef.f)
-#  add_executable(wingroupf wingroupf.f)
+  add_executable(wingroupf wingroupf.f)
 #  add_executable(baseattrwinf baseattrwinf.f)
 #  add_executable(winattr2f winattr2f.f)
 #  add_executable(winattrf winattrf.f)
@@ -25,7 +25,7 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite AND SMPI_FORTRAN)
 target_link_libraries(winaccf simgrid mtest_f77)
 #target_link_libraries(winerrf simgrid mtest_f77)
 target_link_libraries(winfencef simgrid mtest_f77)
-#target_link_libraries(wingroupf simgrid mtest_f77)
+target_link_libraries(wingroupf simgrid mtest_f77)
 #target_link_libraries(baseattrwinf simgrid mtest_f77)
 target_link_libraries(c2f2cwinf simgrid mtest_f77)
 #target_link_libraries(winattr2f simgrid mtest_f77)
@@ -53,6 +53,7 @@ set(examples_src
   ${CMAKE_CURRENT_SOURCE_DIR}/winscale1f.f
   ${CMAKE_CURRENT_SOURCE_DIR}/winscale2f.f
   ${CMAKE_CURRENT_SOURCE_DIR}/addsize.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/attraints.h
   PARENT_SCOPE)
 set(txt_files
   ${txt_files}
diff --git a/teshsuite/smpi/mpich3-test/f77/rma/attraints.h b/teshsuite/smpi/mpich3-test/f77/rma/attraints.h
new file mode 100644
index 0000000000..fb0747f683
--- /dev/null
+++ b/teshsuite/smpi/mpich3-test/f77/rma/attraints.h
@@ -0,0 +1,6 @@
+C -*- Mode: Fortran; -*-
+C
+C  (C) 2003 by Argonne National Laboratory.
+C      See COPYRIGHT in top-level directory.
+C
+       integer extrastate, valin, valout, val
diff --git a/teshsuite/smpi/mpich3-test/f77/rma/testlist b/teshsuite/smpi/mpich3-test/f77/rma/testlist
index f3cf47b553..f9cb52c5d0 100644
--- a/teshsuite/smpi/mpich3-test/f77/rma/testlist
+++ b/teshsuite/smpi/mpich3-test/f77/rma/testlist
@@ -6,12 +6,9 @@ wingetf   5 needs_privatization=1
 #Needs win error handling
 #winerrf 1
 winnamef 1
-#Needs win get group
-#wingroupf 4
+wingroupf 4
 winaccf 4 needs_privatization=1
-#Needs mpi_win_f2c
 c2f2cwinf 1
-#Needs attr
 #baseattrwinf 1
 #winattrf 1
 #winattr2f 1
diff --git a/teshsuite/smpi/mpich3-test/f90/rma/CMakeLists.txt b/teshsuite/smpi/mpich3-test/f90/rma/CMakeLists.txt
index 2572c4bb42..ba8a0d3276 100644
--- a/teshsuite/smpi/mpich3-test/f90/rma/CMakeLists.txt
+++ b/teshsuite/smpi/mpich3-test/f90/rma/CMakeLists.txt
@@ -12,7 +12,7 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite AND SMPI_FORTRAN)
   add_executable(winaccf90 winaccf90.f90)
 #  add_executable(winerrf90 winerrf90.f90)
   add_executable(winfencef90 winfencef90.f90)
-#  add_executable(wingroupf90 wingroupf90.f90)
+  add_executable(wingroupf90 wingroupf90.f90)
 #  add_executable(baseattrwinf90 baseattrwinf90.f90)
 #  add_executable(winattr2f90 winattr2f90.f90)
 #  add_executable(winattrf90 winattrf90.f90)
@@ -25,7 +25,7 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite AND SMPI_FORTRAN)
 target_link_libraries(winaccf90 simgrid mtest_f90)
 #target_link_libraries(winerrf90 simgrid mtest_f90)
 target_link_libraries(winfencef90 simgrid mtest_f90)
-#target_link_libraries(wingroupf90 simgrid mtest_f90)
+target_link_libraries(wingroupf90 simgrid mtest_f90)
 #target_link_libraries(baseattrwinf90 simgrid mtest_f90)
 target_link_libraries(c2f2cwinf90 simgrid mtest_f90)
 #target_link_libraries(winattr2f90 simgrid mtest_f90)
diff --git a/teshsuite/smpi/mpich3-test/f90/rma/testlist b/teshsuite/smpi/mpich3-test/f90/rma/testlist
index 1dddb0c8ac..21748e1f94 100644
--- a/teshsuite/smpi/mpich3-test/f90/rma/testlist
+++ b/teshsuite/smpi/mpich3-test/f90/rma/testlist
@@ -6,7 +6,7 @@ wingetf90 5 needs_privatization=1
 #winscale2f90 4
 #winerrf90 1
 winnamef90 1
-#wingroupf90 4
+wingroupf90 4
 winaccf90 4 needs_privatization=1
 c2f2cwinf90 1
 #baseattrwinf90 1