diff options
-rw-r--r-- | gdb/ChangeLog | 6 | ||||
-rw-r--r-- | gdb/infcmd.c | 2 | ||||
-rw-r--r-- | gdb/testsuite/ChangeLog | 6 | ||||
-rw-r--r-- | gdb/testsuite/gdb.base/finish-pretty.c | 41 | ||||
-rw-r--r-- | gdb/testsuite/gdb.base/finish-pretty.exp | 37 |
5 files changed, 91 insertions, 1 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 0da732a..8150685 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2018-06-14 Tom de Vries <tdevries@suse.de> + + PR cli/22573 + * infcmd.c (print_return_value_1): Use get_user_print_options instead of + get_no_prettyformat_print_options. + 2018-06-13 Simon Marchi <simon.marchi@ericsson.com> * sparc-nat.h: Include target.h. diff --git a/gdb/infcmd.c b/gdb/infcmd.c index b3f0238..5c5faf7 100644 --- a/gdb/infcmd.c +++ b/gdb/infcmd.c @@ -1687,7 +1687,7 @@ print_return_value_1 (struct ui_out *uiout, struct return_value_info *rv) uiout->field_fmt ("gdb-result-var", "$%d", rv->value_history_index); uiout->text (" = "); - get_no_prettyformat_print_options (&opts); + get_user_print_options (&opts); string_file stb; diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index aa568a8..1c98bbd 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2018-06-14 Tom de Vries <tdevries@suse.de> + + PR cli/22573 + * gdb.base/finish-pretty.c: New test. + * gdb.base/finish-pretty.exp: New file. + 2018-06-14 Pedro Alves <palves@redhat.com> * gdb.gdb/selftest.exp (test_with_self): Use multi_line to build diff --git a/gdb/testsuite/gdb.base/finish-pretty.c b/gdb/testsuite/gdb.base/finish-pretty.c new file mode 100644 index 0000000..31f4815 --- /dev/null +++ b/gdb/testsuite/gdb.base/finish-pretty.c @@ -0,0 +1,41 @@ +/* This testcase is part of GDB, the GNU debugger. + + Copyright 2018 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 <http://www.gnu.org/licenses/>. */ + +struct s +{ + int a; + int b; +}; + +static struct s +foo (void) +{ + struct s r; + r.a = 1; + r.b = 2; + return r; +} + +int +main (void) +{ + struct s v; + + v = foo (); + + return v.a + v.b; +} diff --git a/gdb/testsuite/gdb.base/finish-pretty.exp b/gdb/testsuite/gdb.base/finish-pretty.exp new file mode 100644 index 0000000..0c2bc9b --- /dev/null +++ b/gdb/testsuite/gdb.base/finish-pretty.exp @@ -0,0 +1,37 @@ +# Copyright 2018 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 <http://www.gnu.org/licenses/>. + +# Check whether finish respects the print pretty user setting when printing the +# function result. + +standard_testfile + +if { [prepare_for_testing "failed to prepare" $testfile $srcfile] } { + return -1 +} + +proc finish_pretty { } { + if ![runto foo] { + fail "can't run to foo" + return + } + gdb_test_no_output "set print pretty" \ + "pretty printing switched on" + gdb_test "finish" \ + {.*Value returned is \$1 = \{\r\n a = 1, \r\n b = 2\r\n\}} \ + "finish foo prettyprinted function result" +} + +finish_pretty |