From patchwork Wed Aug 24 14:45:48 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Simon Marchi X-Patchwork-Id: 14909 Received: (qmail 88138 invoked by alias); 24 Aug 2016 14:52:10 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 88124 invoked by uid 89); 24 Aug 2016 14:52:09 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.9 required=5.0 tests=BAYES_00, SPF_PASS autolearn=ham version=3.3.2 spammy=Input, Hx-spam-relays-external:14.3.301.0, H*r:14.3.301, H*RU:14.3.301.0 X-HELO: usplmg20.ericsson.net Received: from usplmg20.ericsson.net (HELO usplmg20.ericsson.net) (198.24.6.45) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 24 Aug 2016 14:51:59 +0000 Received: from EUSAAHC003.ericsson.se (Unknown_Domain [147.117.188.81]) by (Symantec Mail Security) with SMTP id B7.B3.02568.9B5BDB75; Wed, 24 Aug 2016 16:56:57 +0200 (CEST) Received: from elxcz23q12-y4.dyn.mo.ca.am.ericsson.se (147.117.188.8) by smtps-am.internal.ericsson.com (147.117.188.81) with Microsoft SMTP Server (TLS) id 14.3.301.0; Wed, 24 Aug 2016 10:45:54 -0400 From: Simon Marchi To: CC: Simon Marchi Subject: [PATCH] Allow resetting an empty inferior-tty Date: Wed, 24 Aug 2016 10:45:48 -0400 Message-ID: <20160824144548.19204-1-simon.marchi@ericsson.com> MIME-Version: 1.0 X-IsSubscribed: yes This patch allows the user to set the inferior-tty to "empty", in order to come back to the default behaviour of using the same tty as gdb is using. This is already supported in MI (and tested in gdb.mi/mi-basics.exp). I added a new test, set-inferior-tty.exp, where I test only the setting and unsetting of the parameter. It would be nice to actually test that the inferior output properly goes to the separate tty, but that will be for another day. gdb/ChangeLog: * infcmd.c (set_inferior_io_terminal): Set inferior terminal to NULL if terminal_name is an empty string. (_initialize_infcmd): Make the argument of "set inferior-tty" optional. gdb/doc/ChangeLog: * gdb.texinfo (Your Program’s Input and Output): Mention possibility to unset inferior-tty. gdb/testsuite/ChangeLog: * gdb.base/set-inferior-tty.exp: New file. * gdb.base/set-inferior-tty.c: New file. --- gdb/doc/gdb.texinfo | 6 +++-- gdb/infcmd.c | 16 +++++++----- gdb/testsuite/gdb.base/set-inferior-tty.c | 24 +++++++++++++++++ gdb/testsuite/gdb.base/set-inferior-tty.exp | 40 +++++++++++++++++++++++++++++ 4 files changed, 78 insertions(+), 8 deletions(-) create mode 100644 gdb/testsuite/gdb.base/set-inferior-tty.c create mode 100644 gdb/testsuite/gdb.base/set-inferior-tty.exp diff --git a/gdb/doc/gdb.texinfo b/gdb/doc/gdb.texinfo index f5dde61..f00729a 100644 --- a/gdb/doc/gdb.texinfo +++ b/gdb/doc/gdb.texinfo @@ -2499,9 +2499,11 @@ display the name of the terminal that will be used for future runs of your program. @table @code -@item set inferior-tty /dev/ttyb +@item set inferior-tty @var{tty} @kindex set inferior-tty -Set the tty for the program being debugged to /dev/ttyb. +Set the tty for the program being debugged to @var{tty}. Omitting @var{tty} +restores the default behavior, which is to use the same terminal as +@value{GDBN}. @item show inferior-tty @kindex show inferior-tty diff --git a/gdb/infcmd.c b/gdb/infcmd.c index 58ba1cb..97a1e35 100644 --- a/gdb/infcmd.c +++ b/gdb/infcmd.c @@ -151,7 +151,11 @@ void set_inferior_io_terminal (const char *terminal_name) { xfree (current_inferior ()->terminal); - current_inferior ()->terminal = terminal_name ? xstrdup (terminal_name) : 0; + + if (terminal_name != NULL && strlen (terminal_name) > 0) + current_inferior ()->terminal = xstrdup (terminal_name); + else + current_inferior ()->terminal = NULL; } const char * @@ -3224,14 +3228,14 @@ _initialize_infcmd (void) const char *cmd_name; /* Add the filename of the terminal connected to inferior I/O. */ - add_setshow_filename_cmd ("inferior-tty", class_run, - &inferior_io_terminal_scratch, _("\ + add_setshow_optional_filename_cmd ("inferior-tty", class_run, + &inferior_io_terminal_scratch, _("\ Set terminal for future runs of program being debugged."), _("\ Show terminal for future runs of program being debugged."), _("\ Usage: set inferior-tty /dev/pts/1"), - set_inferior_tty_command, - show_inferior_tty_command, - &setlist, &showlist); + set_inferior_tty_command, + show_inferior_tty_command, + &setlist, &showlist); add_com_alias ("tty", "set inferior-tty", class_alias, 0); cmd_name = "args"; diff --git a/gdb/testsuite/gdb.base/set-inferior-tty.c b/gdb/testsuite/gdb.base/set-inferior-tty.c new file mode 100644 index 0000000..863fa99 --- /dev/null +++ b/gdb/testsuite/gdb.base/set-inferior-tty.c @@ -0,0 +1,24 @@ +/* This testcase is part of GDB, the GNU debugger. + + Copyright 2016 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +*/ + +int +main (void) +{ + return 0; +} diff --git a/gdb/testsuite/gdb.base/set-inferior-tty.exp b/gdb/testsuite/gdb.base/set-inferior-tty.exp new file mode 100644 index 0000000..1a5f49c --- /dev/null +++ b/gdb/testsuite/gdb.base/set-inferior-tty.exp @@ -0,0 +1,40 @@ +# Copyright 2016 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +standard_testfile + +set compile_options "debug" +if {[build_executable $testfile.exp $testfile ${srcfile} ${compile_options}] == -1} { + untested "failed to compile $testfile" + return -1 +} + +proc test_set_inferior_tty { } { + global binfile + + clean_restart ${binfile} + + gdb_test_no_output "set inferior-tty hello" "set inferior-tty to hello" + gdb_test "show inferior-tty" \ + "Terminal for future runs of program being debugged is \"hello\"." \ + "show inferior-tty shows hello" + + gdb_test_no_output "set inferior-tty" "set inferior-tty to empty" + gdb_test "show inferior-tty" \ + "Terminal for future runs of program being debugged is \"\"." \ + "show inferior-tty shows empty" +} + +test_set_inferior_tty