Message ID | 5481FAB2.9070105@ericsson.com |
---|---|
State | Committed |
Headers | show |
On 12/05/2014 06:34 PM, Simon Marchi wrote: > diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp > index a29b661..b420e00 100644 > --- a/gdb/testsuite/lib/gdb.exp > +++ b/gdb/testsuite/lib/gdb.exp > @@ -5004,5 +5004,30 @@ proc capture_command_output { command prefix } { > return $output_string > } > > +# Return 1 if the current remote target is an instance of our GDBserver, 0 > +# otherwise. Return -1 if there was an error and we can't tell. > + > +gdb_caching_proc target_is_gdbserver { > + global gdb_prompt > + > + set is_gdbserver -1 > + set test "Probing for GDBserver" > + > + gdb_test_multiple "monitor help" $test { > + -re "The following monitor commands are supported.*Quit GDBserver.*$gdb_prompt $" { > + set is_gdbserver 1 > + } > + -re "$gdb_prompt $" { > + set is_gdbserver 0 > + } > + } > + > + if { $is_gdbserver == -1 } { > + verbose -log "Unable to tell whether we are using GDBserver or not." > + } > + > + return $is_gdbserver > +} > + I think it'd be nice to have this close to gdb_is_target_remote. How about moving it just below that one? Anyway, this is OK. Please push. Thanks, Pedro Alves
diff --git a/gdb/testsuite/gdb.trace/qtro.exp b/gdb/testsuite/gdb.trace/qtro.exp index 22b5051..d8ffc40 100644 --- a/gdb/testsuite/gdb.trace/qtro.exp +++ b/gdb/testsuite/gdb.trace/qtro.exp @@ -98,18 +98,7 @@ if { $traceframe_info_supported == -1 } { } # Check whether we're testing with our own GDBserver. -set is_gdbserver -1 -set test "probe for GDBserver" -gdb_test_multiple "monitor help" $test { - -re "The following monitor commands are supported.*debug-hw-points.*remote-debug.*GDBserver.*$gdb_prompt $" { - set is_gdbserver 1 - pass $test - } - -re "$gdb_prompt $" { - set is_gdbserver 0 - pass $test - } -} +set is_gdbserver [target_is_gdbserver] if { $is_gdbserver == -1 } { return -1 } diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp index a29b661..b420e00 100644 --- a/gdb/testsuite/lib/gdb.exp +++ b/gdb/testsuite/lib/gdb.exp @@ -5004,5 +5004,30 @@ proc capture_command_output { command prefix } { return $output_string } +# Return 1 if the current remote target is an instance of our GDBserver, 0 +# otherwise. Return -1 if there was an error and we can't tell. + +gdb_caching_proc target_is_gdbserver { + global gdb_prompt + + set is_gdbserver -1 + set test "Probing for GDBserver" + + gdb_test_multiple "monitor help" $test { + -re "The following monitor commands are supported.*Quit GDBserver.*$gdb_prompt $" { + set is_gdbserver 1 + } + -re "$gdb_prompt $" { + set is_gdbserver 0 + } + } + + if { $is_gdbserver == -1 } { + verbose -log "Unable to tell whether we are using GDBserver or not." + } + + return $is_gdbserver +} + # Always load compatibility stuff. load_lib future.exp