[commit] [testsuite patch] Fix gdb.gdb/selftest.exp for C++-O2-g-built GDB

[Jan Kratochvil <jan.kratochvil@redhat.com>]

[-- Attachment #1: Type: text/plain, Size: 339 bytes --]

On Tue, 19 Jul 2016 11:47:07 +0200, Yao Qi wrote:
> I've pushed my patch in.  Your patch changing test_with_self is no longer
> needed, but changes in do_steps_and_nexts are still useful to fix the fails
> you've seen, so changes in do_steps_and_nexts are OK to commit.

Checked in:
	027d97f8b0193a8113ee60bafc686d45d0af59ee


Thanks,
Jan

[-- Attachment #2: Type: message/rfc822, Size: 1942 bytes --]

From: Jan Kratochvil <jan.kratochvil@redhat.com>
Subject: [PATCH] testsuite: Fix gdb.gdb/selftest.exp for C++-O2-g-built GDB
Date: Wed, 20 Jul 2016 16:26:44 +0200

tested on Fedora 24 x86_64 after:
        ./configure; make
That is: CFLAGS='-g -O2' CXXFLAGS='-g -O2'

FAIL: gdb.gdb/selftest.exp: unknown source line
FAIL: gdb.gdb/selftest.exp: step into xmalloc call

gdb/testsuite/ChangeLog
2016-07-20  Jan Kratochvil  <jan.kratochvil@redhat.com>

	* gdb.gdb/selftest.exp (do_steps_and_nexts): Add "next over TRY" and
	"step into captured_main (args)".
---
 gdb/testsuite/ChangeLog            | 5 +++++
 gdb/testsuite/gdb.gdb/selftest.exp | 8 ++++++++
 2 files changed, 13 insertions(+)

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 3a1bdfd..e7d935e 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,5 +1,10 @@
 2016-07-20  Jan Kratochvil  <jan.kratochvil@redhat.com>
 
+	* gdb.gdb/selftest.exp (do_steps_and_nexts): Add "next over TRY" and
+	"step into captured_main (args)".
+
+2016-07-20  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
 	* gdb.btrace/tailcall-only.exp: Use is_lp64_target check.
 
 2016-07-20  Jan Kratochvil  <jan.kratochvil@redhat.com>
diff --git a/gdb/testsuite/gdb.gdb/selftest.exp b/gdb/testsuite/gdb.gdb/selftest.exp
index 809045a..2fdd9e3 100644
--- a/gdb/testsuite/gdb.gdb/selftest.exp
+++ b/gdb/testsuite/gdb.gdb/selftest.exp
@@ -111,6 +111,14 @@ proc do_steps_and_nexts {} {
 		set description "next over lim_at_start initialization"
 		set command "next"
 	    }
+	    -re ".*TRY.*$gdb_prompt $" {
+		set description "next over TRY"
+		set command "next"
+	    }
+	    -re ".*captured_main \\(args\\);.*$gdb_prompt $" {
+		set description "step into captured_main (args)"
+		set command "step"
+	    }
 	    -re ".*count . 0x3.*$gdb_prompt $" {
 		set description "next over conditional stack alignment code 1"
 		set command "next"
-- 
2.7.4