From 2970becd6bd1c9eb7c16f8c1001ace9c8a3d210a Mon Sep 17 00:00:00 2001 From: Ralph Castain Date: Fri, 18 Mar 2016 07:18:36 -0700 Subject: [PATCH 1/2] Revert "Merge pull request #1451 from ggouaillardet/topic/orte_fork_wrapper_fullname" This reverts commit efafd62d38bb12c161330d5a6e4f338e9b560a7e, reversing changes made to a93b849f13b12a7b1c1cdde71a9e491ddc220e17. --- orte/mca/odls/base/odls_base_default_fns.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/orte/mca/odls/base/odls_base_default_fns.c b/orte/mca/odls/base/odls_base_default_fns.c index 0383df01537..4fa97b711f6 100644 --- a/orte/mca/odls/base/odls_base_default_fns.c +++ b/orte/mca/odls/base/odls_base_default_fns.c @@ -15,7 +15,7 @@ * All rights reserved. * Copyright (c) 2011-2013 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2013-2016 Intel, Inc. All rights reserved. - * Copyright (c) 2014-2016 Research Organization for Information Science + * Copyright (c) 2014 Research Organization for Information Science * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * @@ -973,10 +973,8 @@ void orte_odls_base_default_launch_local(int fd, short sd, void *cbdata) app->argv = NULL; /* now create a new one that starts with the fork agent */ app->argv = opal_argv_copy(orte_fork_agent); - /* app->argv[0] is the basename, but we require the full name that is in app->app */ - opal_argv_append_nosize(&app->argv, app->app); - /* add back the rest of original argv */ - for (inm=1; NULL != argvsav[inm]; inm++) { + /* add back the original argv */ + for (inm=0; NULL != argvsav[inm]; inm++) { opal_argv_append_nosize(&app->argv, argvsav[inm]); } /* the app exe name itself is in the argvsav array, so From 8f410d789722a96d6da5d550cb3beb985146e6da Mon Sep 17 00:00:00 2001 From: Ralph Castain Date: Fri, 18 Mar 2016 07:23:30 -0700 Subject: [PATCH 2/2] Revert one part of open-mpi/ompi@4d0cc27eb7c96a3ad50abf309b6f3186e2f05f58 --- orte/tools/orterun/orterun.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/orte/tools/orterun/orterun.c b/orte/tools/orterun/orterun.c index 6dde2ed177f..5578ae1e1ff 100644 --- a/orte/tools/orterun/orterun.c +++ b/orte/tools/orterun/orterun.c @@ -1676,8 +1676,6 @@ static int create_app(int argc, char* argv[], rc = ORTE_ERR_NOT_FOUND; goto cleanup; } - free(app->argv[0]); - app->argv[0] = opal_basename(app->app); /* if this is a Java application, we have a bit more work to do. Such * applications actually need to be run under the Java virtual machine