From: navarro <navarro@caraja.(none)>
Date: Fri, 26 Oct 2012 17:10:22 +0000 (+0200)
Subject: SMPI finally works ;)
X-Git-Tag: v3_9_rc1~91^2~195
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/a3389a048bf189dd5faf34500b86d2998101a256

SMPI finally works ;)
---

diff --git a/src/smpi/smpirun.in b/src/smpi/smpirun.in
index d1d395edbb..70a4fba81a 100755
--- a/src/smpi/smpirun.in
+++ b/src/smpi/smpirun.in
@@ -168,7 +168,7 @@ if [ -z "${HOSTFILE}" ] ; then
 fi
 
 # Don't use wc -l to compute it to avoid issues with trailing \n at EOF
-hostfile_procs=`grep -c [a-zA-Z0-9] $HOSTFILE`
+hostfile_procs=`grep -c "[a-zA-Z0-9]" $HOSTFILE`
 
 if [ -z "${NUMPROCS}" ] ; then
     # Use the amount of processes in the hostfile as default value for the -np parameter
diff --git a/teshsuite/smpi/mpich-test/CMakeLists.txt b/teshsuite/smpi/mpich-test/CMakeLists.txt
index 783a2b1a6c..ca3a518b6f 100644
--- a/teshsuite/smpi/mpich-test/CMakeLists.txt
+++ b/teshsuite/smpi/mpich-test/CMakeLists.txt
@@ -60,8 +60,8 @@ else()
     foreach(srcfile ${stdo_std_smpi})
         set(dstfile ${srcfile})
         string(REPLACE "${CMAKE_HOME_DIRECTORY}" "${CMAKE_BINARY_DIR}" dstfile "${dstfile}")
-        string(REGEX REPLACE "/[^/]*.std" "/" dstfile "${dstfile}")
         string(REGEX REPLACE "/[^/]*.stdo" "/" dstfile "${dstfile}")
+        string(REGEX REPLACE "/[^/]*.std" "/" dstfile "${dstfile}")
         #message("copy ${srcfile} to ${dstfile}")
         file(COPY ${srcfile} DESTINATION ${dstfile})
     endforeach()
diff --git a/teshsuite/smpi/mpich-test/pt2pt/sendcplx.stdo b/teshsuite/smpi/mpich-test/pt2pt/sendcplx.stdo
index 7314209227..3f5bbcc52f 100644
--- a/teshsuite/smpi/mpich-test/pt2pt/sendcplx.stdo
+++ b/teshsuite/smpi/mpich-test/pt2pt/sendcplx.stdo
@@ -1,4 +1,3 @@
  Received A
  A(1,1) =  (1.,1.) A(1,2) =  (1.,2.)
- A(2,1) =  (2.,1.) A(2,2) =  (2.,2.)
-*** Testing Fortran send ***
+ A(2,1) =  (2.,1.) A(2,2) =  (2.,2.)
\ No newline at end of file