Skip to content
This repository was archived by the owner on Sep 30, 2022. It is now read-only.

Commit 8b29aa8

Browse files
committed
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> (cherry picked from commit open-mpi/ompi@69de442) Signed-off-by: Nathan Hjelm <hjelmn@me.com>
1 parent e8ae71b commit 8b29aa8

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

orte/tools/orterun/orterun.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
/* -*- C -*-
2-
*
1+
/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
2+
/*
33
* Copyright (c) 2004-2010 The Trustees of Indiana University and Indiana
44
* University Research and Technology
55
* Corporation. All rights reserved.
@@ -12,7 +12,7 @@
1212
* All rights reserved.
1313
* Copyright (c) 2006-2015 Cisco Systems, Inc. All rights reserved.
1414
* Copyright (c) 2007-2009 Sun Microsystems, Inc. All rights reserved.
15-
* Copyright (c) 2007-2013 Los Alamos National Security, LLC. All rights
15+
* Copyright (c) 2007-2016 Los Alamos National Security, LLC. All rights
1616
* reserved.
1717
* Copyright (c) 2013-2014 Intel, Inc. All rights reserved.
1818
* $COPYRIGHT$
@@ -2433,8 +2433,8 @@ static int process(char *orig_line, char *basename, opal_cmd_line_t *cmd_line,
24332433
}
24342434

24352435
/* Some debuggers do not support launching MPMD */
2436-
else if (single_app && NULL != strchr(tmp, ':')) {
2437-
orte_show_help("help-orterun.txt",
2436+
else if (single_app && NULL != strstr(tmp, " : ")) {
2437+
orte_show_help("help-orterun.txt",
24382438
"debugger only accepts single app", true,
24392439
(*new_argv)[0], (*new_argv)[0]);
24402440
/* Fall through to free / fail, below */

0 commit comments

Comments
 (0)