Cleanup the MPI_Finalize_c/f tests

Fix a few errors:

* copy the key across for calls to PMIx job_control
* re-initialize orte_process_info.aliases in case someone foolishly re-calls orte_init
* protect the ompi errcodes in case someone foolishly re-calls MPI_Init

Signed-off-by: Ralph Castain <[email protected]>

Author: Ralph Castain

ompi/errhandler/errcode-internal.h

@@ -14,6 +14,7 @@
  * Copyright (c) 2010      Oracle and/or its affiliates.  All rights reserved.
  * Copyright (c) 2012      Los Alamos National Security, LLC.  All rights
  *                         reserved.
+ * Copyright (c) 2018      Intel, Inc. All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -69,7 +70,7 @@ static inline int ompi_errcode_get_mpi_code(int errcode)
        it */
     for (i = 0; i < ompi_errcode_intern_lastused; i++) {
         errc = (ompi_errcode_intern_t *)opal_pointer_array_get_item(&ompi_errcodes_intern, i);
-        if (errc->code == errcode) {
+        if (NULL != errc && errc->code == errcode) {
             ret = errc->mpi_code;
             break;
         }

opal/mca/pmix/pmix2x/pmix2x_server_north.c

@@ -1,6 +1,6 @@
 /* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
 /*
- * Copyright (c) 2014-2017 Intel, Inc.  All rights reserved.
+ * Copyright (c) 2014-2018 Intel, Inc. All rights reserved.
  * Copyright (c) 2014-2017 Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
  * Copyright (c) 2014-2015 Mellanox Technologies, Inc.
@@ -1243,6 +1243,7 @@ static pmix_status_t server_job_control(const pmix_proc_t *proct,
     for (n=0; n < ndirs; n++) {
         oinfo = OBJ_NEW(opal_value_t);
         opal_list_append(&opalcaddy->info, &oinfo->super);
+        oinfo->key = strdup(directives[n].key);
         if (OPAL_SUCCESS != (rc = pmix2x_value_unload(oinfo, &directives[n].value))) {
             OBJ_RELEASE(opalcaddy);
             return pmix2x_convert_opalrc(rc);

orte/orted/pmix/pmix_server_gen.c

@@ -13,7 +13,7 @@
  *                         All rights reserved.
  * Copyright (c) 2009      Cisco Systems, Inc.  All rights reserved.
  * Copyright (c) 2011      Oak Ridge National Labs.  All rights reserved.
- * Copyright (c) 2013-2017 Intel, Inc.  All rights reserved.
+ * Copyright (c) 2013-2018 Intel, Inc. All rights reserved.
  * Copyright (c) 2014-2017 Mellanox Technologies, Inc.
  *                         All rights reserved.
  * Copyright (c) 2014      Research Organization for Information Science
@@ -863,7 +863,6 @@ int pmix_server_job_ctrl_fn(const opal_process_name_t *requestor,
             ORTE_ERROR_LOG(ORTE_ERR_BAD_PARAM);
             continue;
         }
-
         if (0 == strcmp(val->key, OPAL_PMIX_JOB_CTRL_KILL)) {
             /* convert the list of targets to a pointer array */
             if (NULL == targets) {

orte/util/proc_info.c

@@ -12,7 +12,7 @@
  * Copyright (c) 2009-2016 Cisco Systems, Inc.  All rights reserved.
  * Copyright (c) 2012      Los Alamos National Security, LLC.
  *                         All rights reserved.
- * Copyright (c) 2014-2017 Intel, Inc. All rights reserved.
+ * Copyright (c) 2014-2018 Intel, Inc. All rights reserved.
  * Copyright (c) 2016      IBM Corporation.  All rights reserved.
  * $COPYRIGHT$
  *
@@ -327,6 +327,7 @@ int orte_proc_info_finalize(void)
     orte_process_info.proc_type = ORTE_PROC_TYPE_NONE;
 
     opal_argv_free(orte_process_info.aliases);
+    orte_process_info.aliases = NULL;
 
     init = false;
     return ORTE_SUCCESS;