- corrected test on -map

[simgrid.git] / src / smpi / smpirun.in

diff --git a/src/smpi/smpirun.in b/src/smpi/smpirun.in
index e478855..c5a4b17 100755 (executable)
--- a/src/smpi/smpirun.in
+++ b/src/smpi/smpirun.in
@@ -43,25 +43,30 @@ while true; do
       fi
        shift 2
     ;;
-
+   
    "-map")
-       MAPOPT="on"
+       MAPOPT="true"
       shift 1
    ;;
 
-   "-quiet")
-       QUIET="true"
+   "-keep-temps")
+       KEEP="true"
       shift 1
    ;;
 
    "-help" | "--help" | "-h") 
       echo "usage:"
-      echo "$0 [-quiet] [-np <numprocs>] -platform <xmldesc> -hostfile <hostfile> [-map] program [program-options]"
+      echo "$0 [-quiet] [-keep-temps] [-np <numprocs>] -platform <xmldesc> -hostfile <hostfile> [-map] program [program-options]"
       echo "or (deprecated usage):"
-      echo "$0 [-quiet] [-np <numprocs>] [-bandwidth <bytes/sec>] [-latency <secs>] program [program-options]"
+      echo "$0 [-quiet] [-keep-temps] [-np <numprocs>] [-bandwidth <bytes/sec>] [-latency <secs>] program [program-options]"
       echo
       exit
    ;;
+   
+   "--cfg="*)
+     SIMOPTS="$SIMOPTS $1"
+     shift 1
+   ;;
     *)
       break
     ;;
@@ -143,7 +148,7 @@ do
        j=$(( $i % ${NUMHOSTS} ))
   fi 
   ##---- optional display of ranks to process mapping
-  if [ -n ${MAPOPT} ]; then
+  if [ -n "${MAPOPT}" ]; then
        echo "[rank $i] -> ${hostnames[$j]}"  
   fi
 
@@ -165,15 +170,14 @@ cat >> ${APPLICATIONTMP} <<APPLICATIONFOOT
 APPLICATIONFOOT
 ##-------------------------------- end DEFAULT APPLICATION --------------------------------------
 
-if [ -z "${QUIET}" ] ; then
-  echo ${EXEC} ${PLATFORMTMP} ${APPLICATIONTMP}
+if [ -n "${KEEP}" ] ; then
+  echo ${EXEC} ${SIMOPTS} ${PLATFORMTMP} ${APPLICATIONTMP}
 fi
-${EXEC} ${PLATFORMTMP} ${APPLICATIONTMP}
+${EXEC} ${SIMOPTS} ${PLATFORMTMP} ${APPLICATIONTMP}
 
-if [ -z "${QUIET}" ] ; then
-  echo "[$0] cleaning up temp files"
-fi
-if [ -z "${PLATFORM}" ]; then
+if [ -z "${KEEP}" ] ; then
+   if [ -z "${PLATFORM}" ]; then
        rm ${PLATFORMTMP} 
+   fi
+   rm ${APPLICATIONTMP}
 fi
-rm ${APPLICATIONTMP}