- Once again: uninteresting cleanup to get diff smaller.

This commit was SVN r7178.

contrib/nightly/ompi_cronjob.sh

@@ -4,9 +4,12 @@
 #
 #
 SRCDIR=$HOME/WORK/OPENMPI                   # Where the script and the tar-balls reside
-LAST_VERSION=1.0a1r6211                # Should be detected by download
+DATE_STRING=`date +%Y.%m.%d`                # Date string for tmp-/scratch-dir
-TEST_VERSION=r360
+TMPDIR=`ws_allocate OpenMPI-$DATE_STRING 3` # Where to build the OMPI 
+LAST_VERSION=1.0a1r6896                     # Should be detected by download
+TEST_VERSION=r362
 CONFIG_FILE=build-$HOSTNAME.txt
+PATCHES="ompi_orte.diff"                    # Comma-separated list of patches to apply when building
 #EMAIL="testing@open-mpi.org"
 EMAIL="keller@hlrs.de"
 
@@ -113,7 +116,9 @@ fi
 #
 # Here comes the main part.
 #
-perl build_tarball.pl --email $EMAIL --config $CONFIG_FILE --file openmpi-$version.tar.bz2 --leave-install $SRCDIR/ompi-out-$version.txt --install-dir=$HOME/ompi-install --nocheck
+perl build_tarball.pl --email $EMAIL --config $CONFIG_FILE --scratch $TMPDIR --file openmpi-$version.tar.bz2 \
+                      --patches "$PATCHES" \
+                      --leave-install $SRCDIR/ompi-out-$version.txt --install-dir=$HOME/ompi-install --nocheck
 
 if [ \! -r ompi-out-$version.txt ] ; then
   echo "No ompi-out-$version.txt file found; none of the configurations have been built?"

opal/util/error.c

@@ -16,10 +16,14 @@
 
 #include "ompi_config.h"
 
+#ifdef HAVE_STRING_H
 #include <string.h>
+#endif
 #include <errno.h>
 #include <stdio.h>
+#ifdef HAVE_STDLIB_H
 #include <stdlib.h>
+#endif
 
 #include "opal/util/error.h"
 #include "opal/include/constants.h"

orte/tools/orterun/orterun.c

@@ -733,9 +733,7 @@ static int parse_locals(int argc, char* argv[])
     env = NULL;
     for (app_num = 0, i = 1; i < argc; ++i) {
         if (0 == strcmp(argv[i], ":")) {
-            
             /* Make an app with this argv */
-
             if (opal_argv_count(temp_argv) > 1) {
                 if (NULL != env) {
                     opal_argv_free(env);
@@ -911,7 +909,7 @@ static int create_app(int argc, char* argv[], orte_app_context_t **app_ptr,
             map_data = true;
         }
 
-        /* Huersitic: if the string fits "[cn][0-9]+" or [cn][0-9],",
+        /* Heuristic: if the string fits "[cn][0-9]+" or "[cn][0-9],",
            then accept it as mapping data */
 
         else if ('c' == argv[i][0] || 'n' == argv[i][0]) {