From 40fb20d037581bc9d4b17b6ab64ee98825cfacab Mon Sep 17 00:00:00 2001 From: Yao Qi Date: Thu, 18 Feb 2016 12:04:32 +0000 Subject: [PATCH] Set breakpoint condition-evaluation in forking-threads-plus-breakpoint.exp Proc do_test in forking-threads-plus-breakpoint.exp has an argument cond_bp_target, but the test doesn't use it to set "breakpoint condition-evaluation", which is an oversight in the test. This patch fixes it by setting "breakpoint condition-evaluation" per $cond_bp_target. gdb/testsuite: 2016-02-18 Yao Qi * gdb.threads/forking-threads-plus-breakpoint.exp (do_test): Set "set breakpoint condition-evaluation" per $cond_bp_target. --- gdb/testsuite/ChangeLog | 5 +++++ .../forking-threads-plus-breakpoint.exp | 15 +++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 462ba707e15..1851c30cce2 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2016-02-18 Yao Qi + + * gdb.threads/forking-threads-plus-breakpoint.exp (do_test): + Set "set breakpoint condition-evaluation" per $cond_bp_target. + 2016-02-16 Doug Evans * gdb.base/skip.c: Add copyright. Whitespace cleanup. diff --git a/gdb/testsuite/gdb.threads/forking-threads-plus-breakpoint.exp b/gdb/testsuite/gdb.threads/forking-threads-plus-breakpoint.exp index ff3ca9af59c..3d8b3080cc7 100644 --- a/gdb/testsuite/gdb.threads/forking-threads-plus-breakpoint.exp +++ b/gdb/testsuite/gdb.threads/forking-threads-plus-breakpoint.exp @@ -83,6 +83,21 @@ proc do_test { cond_bp_target detach_on_fork displaced } { return 0 } + if {$cond_bp_target} { + set test "set breakpoint condition-evaluation target" + gdb_test_multiple $test $test { + -re "warning: Target does not support breakpoint condition evaluation.\r\nUsing host evaluation mode instead.\r\n$gdb_prompt $" { + # Target doesn't support breakpoint condition + # evaluation on its side. Skip the test. + return 0 + } + -re "^$test\r\n$gdb_prompt $" { + } + } + } else { + gdb_test_no_output "set breakpoint condition-evaluation host" + } + gdb_test_no_output "set detach-on-fork $detach_on_fork" gdb_test_no_output "set displaced $displaced" -- 2.30.2