aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gdb/testsuite/ChangeLog5
-rw-r--r--gdb/testsuite/lib/selftest-support.exp5
2 files changed, 10 insertions, 0 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index b6f21d7..a83c9f8 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2016-07-12 Yao Qi <yao.qi@linaro.org>
+
+ * lib/selftest-support.exp (selftest_setup): Match the output
+ when captured_main is inlined.
+
2016-07-07 Walfred Tedeschi <walfred.tedeschi@intel.com>
* gdb.fortran/derived-types.exp (result_line, result_line_2):
diff --git a/gdb/testsuite/lib/selftest-support.exp b/gdb/testsuite/lib/selftest-support.exp
index df99f58..f171cc8 100644
--- a/gdb/testsuite/lib/selftest-support.exp
+++ b/gdb/testsuite/lib/selftest-support.exp
@@ -94,6 +94,11 @@ proc selftest_setup { executable function } {
-re "Starting program.*Breakpoint \[0-9\]+,.*$function .data.*$gdb_prompt $" {
xfail "$description (line numbers scrambled?)"
}
+ -re "Starting program.*Breakpoint \[0-9\]+,.* at .*main.c:.*$function.*$gdb_prompt $" {
+ # $function may be inlined, so the program stops at the line
+ # calling $function.
+ pass "$description"
+ }
-re "vfork: No more processes.*$gdb_prompt $" {
fail "$description (out of virtual memory)"
set timeout $oldtimeout