From 2036b7e0e74317037c64f68121a00beac23ed1a0 Mon Sep 17 00:00:00 2001
From: Augustin Degomme <adegomme@gmail.com>
Date: Fri, 26 Jul 2019 14:34:49 +0200
Subject: [PATCH] activate a fortran test

---
 src/smpi/bindings/smpi_f77_comm.cpp                    | 5 ++---
 src/smpi/bindings/smpi_f77_type.cpp                    | 4 ++--
 src/smpi/mpi/smpi_datatype.cpp                         | 8 ++++++--
 teshsuite/smpi/mpich3-test/f77/datatype/testlist       | 2 +-
 teshsuite/smpi/mpich3-test/f90/datatype/CMakeLists.txt | 6 +++---
 teshsuite/smpi/mpich3-test/f90/datatype/structf.f90    | 3 ++-
 teshsuite/smpi/mpich3-test/f90/datatype/testlist       | 2 +-
 7 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/src/smpi/bindings/smpi_f77_comm.cpp b/src/smpi/bindings/smpi_f77_comm.cpp
index 8e3c44c200..4ea26641c3 100644
--- a/src/smpi/bindings/smpi_f77_comm.cpp
+++ b/src/smpi/bindings/smpi_f77_comm.cpp
@@ -100,9 +100,8 @@ void mpi_comm_free_keyval_ (int* keyval, int* ierr) {
 
 void mpi_comm_get_name_ (int* comm, char* name, int* len, int* ierr){
  *ierr = MPI_Comm_get_name(simgrid::smpi::Comm::f2c(*comm), name, len);
-  if(*len>0)
-    for(int i = *len; i<MPI_MAX_OBJECT_NAME+1; i++)
-      name[i]=' ';
+  for(int i = *len; i<MPI_MAX_OBJECT_NAME+1; i++)
+    name[i]=' ';
 }
 
 void mpi_comm_compare_ (int* comm1, int* comm2, int *result, int* ierr){
diff --git a/src/smpi/bindings/smpi_f77_type.cpp b/src/smpi/bindings/smpi_f77_type.cpp
index f59b92d9bb..1f71496026 100644
--- a/src/smpi/bindings/smpi_f77_type.cpp
+++ b/src/smpi/bindings/smpi_f77_type.cpp
@@ -52,8 +52,8 @@ void mpi_type_set_name_ (int*  datatype, char * name, int* ierr, int size){
 
 void mpi_type_get_name_ (int*  datatype, char * name, int* len, int* ierr){
  *ierr = MPI_Type_get_name(simgrid::smpi::Datatype::f2c(*datatype),name,len);
-  if(*len>0)
-    name[*len]=' ';
+  for(int i = *len; i<MPI_MAX_OBJECT_NAME+1; i++)
+    name[i]=' ';
 }
 
 void mpi_type_get_attr_ (int* type, int* type_keyval, int *attribute_val, int* flag, int* ierr){
diff --git a/src/smpi/mpi/smpi_datatype.cpp b/src/smpi/mpi/smpi_datatype.cpp
index a3d6f8a2bb..a22b3d45cf 100644
--- a/src/smpi/mpi/smpi_datatype.cpp
+++ b/src/smpi/mpi/smpi_datatype.cpp
@@ -238,8 +238,12 @@ int Datatype::extent(MPI_Aint * lb, MPI_Aint * extent){
 }
 
 void Datatype::get_name(char* name, int* length){
-  *length = strlen(name_);
-  strncpy(name, name_, *length+1);
+  if(name_!=nullptr){
+    *length = strlen(name_);
+    strncpy(name, name_, *length+1);
+  }else{
+    *length = 0;
+  }
 }
 
 void Datatype::set_name(const char* name){
diff --git a/teshsuite/smpi/mpich3-test/f77/datatype/testlist b/teshsuite/smpi/mpich3-test/f77/datatype/testlist
index fe7afa539a..a98a1f26ff 100644
--- a/teshsuite/smpi/mpich3-test/f77/datatype/testlist
+++ b/teshsuite/smpi/mpich3-test/f77/datatype/testlist
@@ -1,6 +1,6 @@
 #typenamef 1
 #typename3f 1 mpiversion=3.0
-#typesnamef 1
+typesnamef 1
 #typecntsf 1
 #typem2f 1
 typesubf 1
diff --git a/teshsuite/smpi/mpich3-test/f90/datatype/CMakeLists.txt b/teshsuite/smpi/mpich3-test/f90/datatype/CMakeLists.txt
index 5b2f44a0cd..bc7223c84e 100644
--- a/teshsuite/smpi/mpich3-test/f90/datatype/CMakeLists.txt
+++ b/teshsuite/smpi/mpich3-test/f90/datatype/CMakeLists.txt
@@ -8,12 +8,12 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite AND SMPI_FORTRAN)
 
   include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi")
 
-  foreach(test gaddressf90
+  foreach(test gaddressf90 typesnamef90 structf
              # allctypesf90 createf90 get_elem_d get_elem_u
 	     # hindex1f90 hindexed_blockf90 
 	       indtype kinds
-	     # packef90 sizeof structf trf90 typecntsf90 typem2f90 typename3f90
-	     # typenamef90 typesnamef90
+	     # packef90 sizeof  trf90 typecntsf90 typem2f90 typename3f90
+	     # typenamef90 
 	       typesubf90)
     add_executable(${test} EXCLUDE_FROM_ALL ${test}.f90)
     add_dependencies(tests ${test})
diff --git a/teshsuite/smpi/mpich3-test/f90/datatype/structf.f90 b/teshsuite/smpi/mpich3-test/f90/datatype/structf.f90
index 8227ef06cd..dbdc86101c 100644
--- a/teshsuite/smpi/mpich3-test/f90/datatype/structf.f90
+++ b/teshsuite/smpi/mpich3-test/f90/datatype/structf.f90
@@ -14,8 +14,9 @@
 ! for MPICH, and to fit in the MPICH test harness - WDG
 !
       program bustit
-      implicit none
       use mpi
+      implicit none
+
       
       integer comm
       integer newtype
diff --git a/teshsuite/smpi/mpich3-test/f90/datatype/testlist b/teshsuite/smpi/mpich3-test/f90/datatype/testlist
index 5b158a0f29..f10917c31b 100644
--- a/teshsuite/smpi/mpich3-test/f90/datatype/testlist
+++ b/teshsuite/smpi/mpich3-test/f90/datatype/testlist
@@ -1,7 +1,7 @@
 # This file generated by f77tof90
 #typenamef90 1
 #typename3f90 1 mpiversion=3.0
-#typesnamef90 1
+typesnamef90 1
 #typecntsf90 1
 #typem2f90 1
 typesubf90 1
-- 
2.20.1