From abf1152ad77baabd40d8c62324e5de922db246a5 Mon Sep 17 00:00:00 2001 From: Jan Kratochvil Date: Sat, 3 Mar 2012 14:21:04 +0000 Subject: gdb/ * breakpoint.c (set_condition_evaluation_mode): Set CONDITION_EVALUATION_MODE unconditionally. gdb/testsuite/ Implement testsuite workaround for PR breakpoints/13781. * gdb.cp/mb-templates.exp: New loop with variable $workaround. (set breakpoint condition-evaluation host): New conditional command. --- gdb/breakpoint.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gdb/breakpoint.c') diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index 3decd92..5388a4e 100644 --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -761,6 +761,10 @@ set_condition_evaluation_mode (char *args, int from_tty, new_mode = translate_condition_evaluation_mode (condition_evaluation_mode_1); old_mode = translate_condition_evaluation_mode (condition_evaluation_mode); + /* Flip the switch. Flip it even if OLD_MODE == NEW_MODE as one of the + settings was "auto". */ + condition_evaluation_mode = condition_evaluation_mode_1; + /* Only update the mode if the user picked a different one. */ if (new_mode != old_mode) { @@ -772,9 +776,6 @@ set_condition_evaluation_mode (char *args, int from_tty, "target" -> "host": Remove all the conditions from the target. */ - /* Flip the switch. */ - condition_evaluation_mode = condition_evaluation_mode_1; - if (new_mode == condition_evaluation_target) { /* Mark everything modified and synch conditions with the -- cgit v1.1