From ac17fda08bf2a75ba561a919f05df95ff07959de Mon Sep 17 00:00:00 2001 From: Catalin Udma Date: Tue, 5 Apr 2016 12:55:14 +0300 Subject: testsuite: Update py-mi-objfile to expect console format print Starting with this commit: commit e7ea3ec7c623be0b9be1eaf4929794652a84be11 Author: Catalin Udma Date: Mon Feb 29 16:16:19 2016 +0200 python: Use console format for output of gdb.execute command the python script would use console format for gdb.execute output. This patch fixes py-mi-objfile to expect the console format when is checking for gdb.execute printing. gdb/testsuite/ChangeLog: 2016-04-05 Catalin Udma * gdb.python/py-mi-objfile-gdb.py: Use "list main" command. * gdb.python/py-mi-objfile.exp: Match "list main" output in console format. Signed-off-by: Catalin Udma --- gdb/testsuite/ChangeLog | 6 ++++++ gdb/testsuite/gdb.python/py-mi-objfile-gdb.py | 5 ++--- gdb/testsuite/gdb.python/py-mi-objfile.exp | 3 ++- 3 files changed, 10 insertions(+), 4 deletions(-) (limited to 'gdb') diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 222e2f5..27806a0 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2016-04-05 Catalin Udma + + * gdb.python/py-mi-objfile-gdb.py: Use "list main" command. + * gdb.python/py-mi-objfile.exp: Match "list main" output + in console format. + 2016-04-05 Simon Marchi * gdb.arch/ftrace-insn-reloc.exp: Check for IPA basename instead of diff --git a/gdb/testsuite/gdb.python/py-mi-objfile-gdb.py b/gdb/testsuite/gdb.python/py-mi-objfile-gdb.py index 492d71c..2c7f96d 100644 --- a/gdb/testsuite/gdb.python/py-mi-objfile-gdb.py +++ b/gdb/testsuite/gdb.python/py-mi-objfile-gdb.py @@ -22,6 +22,5 @@ import gdb # This will create one for to_string=True and then another for the # parameter change notification. gdb.execute("set width 101", to_string=True) -# And finally a command that will use the original MI stream, which in a -# buggy gdb will use just-freed data. -gdb.execute("list") +# And finally a command that will use the console stream without redirection +gdb.execute("list main") diff --git a/gdb/testsuite/gdb.python/py-mi-objfile.exp b/gdb/testsuite/gdb.python/py-mi-objfile.exp index 073e4d9..bfa43a2 100644 --- a/gdb/testsuite/gdb.python/py-mi-objfile.exp +++ b/gdb/testsuite/gdb.python/py-mi-objfile.exp @@ -53,5 +53,6 @@ if [is_remote host] { # PR 18833. This will cause an unpatched gdb to crash. mi_gdb_test "-file-exec-and-symbols ${filename}" \ - ".*\\^done,line=.*${srcfile}\"" \ + ".*main \\(.*void\\).*\ + return 0;.*\\^done" \ "file-exec-and-symbols operation" -- cgit v1.1