1
1

orterun: allow DDT if options contain :'s

There is a bug in MPMD detection that disables totalview if a : is
found anywhere on the command line. This includes inside an argument
option or MCA variable value. This commit changes the check to look
for the string " : " instead of the character : which should eliminate
the issue in most cases.

Signed-off-by: Nathan Hjelm <hjelmn@lanl.gov>
Этот коммит содержится в:
Nathan Hjelm 2016-02-18 16:56:08 -07:00
родитель 142e38cbb2
Коммит 69de442136

Просмотреть файл

@ -1,5 +1,5 @@
/* -*- C -*- /* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
* /*
* Copyright (c) 2004-2010 The Trustees of Indiana University and Indiana * Copyright (c) 2004-2010 The Trustees of Indiana University and Indiana
* University Research and Technology * University Research and Technology
* Corporation. All rights reserved. * Corporation. All rights reserved.
@ -12,7 +12,7 @@
* All rights reserved. * All rights reserved.
* Copyright (c) 2006-2015 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2006-2015 Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2007-2009 Sun Microsystems, Inc. All rights reserved. * Copyright (c) 2007-2009 Sun Microsystems, Inc. All rights reserved.
* Copyright (c) 2007-2013 Los Alamos National Security, LLC. All rights * Copyright (c) 2007-2016 Los Alamos National Security, LLC. All rights
* reserved. * reserved.
* Copyright (c) 2013-2016 Intel, Inc. All rights reserved. * Copyright (c) 2013-2016 Intel, Inc. All rights reserved.
* Copyright (c) 2015 Research Organization for Information Science * Copyright (c) 2015 Research Organization for Information Science
@ -2111,7 +2111,7 @@ static int process(char *orig_line, char *basename, opal_cmd_line_t *cmd_line,
} }
/* Some debuggers do not support launching MPMD */ /* Some debuggers do not support launching MPMD */
else if (single_app && NULL != strchr(tmp, ':')) { else if (single_app && NULL != strstr(tmp, " : ")) {
orte_show_help("help-orterun.txt", orte_show_help("help-orterun.txt",
"debugger only accepts single app", true, "debugger only accepts single app", true,
(*new_argv)[0], (*new_argv)[0]); (*new_argv)[0], (*new_argv)[0]);