From e5a1a79a4e0ee33292d45b10a759eb41f7358b7c Mon Sep 17 00:00:00 2001 From: Alan Hayward Date: Mon, 8 Apr 2019 16:02:55 +0100 Subject: [PATCH] Testsuite: Add gdbserver sysroot test The local board file ensures that the sysroot is always set to load files from the local filesystem. Add a gdbserver test to explicitly test the sysroot set to both the remote target and the local filesystem. gdb/testsuite/ChangeLog: * gdb.server/sysroot.c: New test. * gdb.server/sysroot.exp: New file. * lib/gdbserver-support.exp (gdb_target_cmd): Add additional text matching param. --- gdb/testsuite/ChangeLog | 7 +++ gdb/testsuite/gdb.server/sysroot.c | 25 ++++++++ gdb/testsuite/gdb.server/sysroot.exp | 77 +++++++++++++++++++++++++ gdb/testsuite/lib/gdbserver-support.exp | 16 ++--- 4 files changed, 118 insertions(+), 7 deletions(-) create mode 100644 gdb/testsuite/gdb.server/sysroot.c create mode 100644 gdb/testsuite/gdb.server/sysroot.exp diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 3b952b8d2fe..7fb071adc64 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,10 @@ +2019-04-11 Alan Hayward + + * gdb.server/sysroot.c: New test. + * gdb.server/sysroot.exp: New file. + * lib/gdbserver-support.exp (gdb_target_cmd): Add additional text + matching param. + 2019-04-11 Andrew Burgess * gdb.base/align.exp: Extend test to cover structures containing diff --git a/gdb/testsuite/gdb.server/sysroot.c b/gdb/testsuite/gdb.server/sysroot.c new file mode 100644 index 00000000000..7db1a138d16 --- /dev/null +++ b/gdb/testsuite/gdb.server/sysroot.c @@ -0,0 +1,25 @@ +/* This testcase is part of GDB, the GNU debugger. + + Copyright 2019 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ + +#include + +int +main () +{ + printf ("Hello World!\n"); + return 0; +} diff --git a/gdb/testsuite/gdb.server/sysroot.exp b/gdb/testsuite/gdb.server/sysroot.exp new file mode 100644 index 00000000000..4b95fdf087c --- /dev/null +++ b/gdb/testsuite/gdb.server/sysroot.exp @@ -0,0 +1,77 @@ +# This testcase is part of GDB, the GNU debugger. +# +# Copyright 2019 Free Software Foundation, Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# Test that GDB can correctly read the binary and shared libraries +# with different sysroot setups: local and "target:". + +load_lib gdbserver-support.exp + +if { [skip_gdbserver_tests] } { + verbose "skipping gdbserver tests" + return -1 +} + +standard_testfile +if {[build_executable "failed to prepare" $testfile $srcfile "additional_flags=--no-builtin"] == -1} { + return -1 +} + +# Run once with sysroot set to the local filesystem and once set to the remote +# target. +foreach_with_prefix sysroot { "local" "remote" } { + global srcdir + global subdir + global binfile + + if { $sysroot == "local" } { + set sysroot_command "/" + set reading_symbols "Reading symbols from $binfile..." + } else { + set sysroot_command "target:" + set reading_symbols "Reading $binfile from remote target..." + } + + # Restart GDB. + clean_restart + + # Make sure we're disconnected, in case we're testing with an + # extended-remote board, therefore already connected. + gdb_test "disconnect" ".*" + + # Start GDBserver. + set res [gdbserver_start "" $binfile] + set gdbserver_protocol [lindex $res 0] + set gdbserver_gdbport [lindex $res 1] + + # Set the sysroot. + gdb_test_no_output "set sysroot $sysroot_command" + + # Connect to gdbserver, making sure GDB reads in the binary correctly. + set test "connect to remote and read binary" + if {[gdb_target_cmd $gdbserver_protocol $gdbserver_gdbport $reading_symbols] == 0} { + pass $test + } else { + fail $test + } + + gdb_breakpoint main + gdb_test "continue" "Breakpoint $decimal.* main.*" "continue to main" + + # Test that we can stop inside a library. + gdb_breakpoint printf + gdb_test "continue" "Breakpoint $decimal.* printf .*" "continue to printf" +} diff --git a/gdb/testsuite/lib/gdbserver-support.exp b/gdb/testsuite/lib/gdbserver-support.exp index dbd885aa221..2cb64f7d2f5 100644 --- a/gdb/testsuite/lib/gdbserver-support.exp +++ b/gdb/testsuite/lib/gdbserver-support.exp @@ -42,9 +42,11 @@ # # gdb_target_cmd -# Send gdb the "target" command +# Send gdb the "target" command. Returns 0 on success, 1 on failure. +# If specified, then ADDITIONAL_TEXT must match the text that comes after +# the connection message in order for the procedure to succeed. # -proc gdb_target_cmd { targetname serialport } { +proc gdb_target_cmd { targetname serialport {additional_text ""} } { global gdb_prompt set serialport_re [string_to_regexp $serialport] @@ -61,23 +63,23 @@ proc gdb_target_cmd { targetname serialport } { -re "Couldn't establish connection to remote.*$gdb_prompt $" { verbose "Connection failed" } - -re "Remote MIPS debugging.*$gdb_prompt" { + -re "Remote MIPS debugging.*$additional_text.*$gdb_prompt" { verbose "Set target to $targetname" return 0 } - -re "Remote debugging using .*$serialport_re.*$gdb_prompt $" { + -re "Remote debugging using .*$serialport_re.*$additional_text.*$gdb_prompt $" { verbose "Set target to $targetname" return 0 } - -re "Remote debugging using stdio.*$gdb_prompt $" { + -re "Remote debugging using stdio.*$additional_text.*$gdb_prompt $" { verbose "Set target to $targetname" return 0 } - -re "Remote target $targetname connected to.*$gdb_prompt $" { + -re "Remote target $targetname connected to.*$additional_text.*$gdb_prompt $" { verbose "Set target to $targetname" return 0 } - -re "Connected to.*$gdb_prompt $" { + -re "Connected to.*$additional_text.*$gdb_prompt $" { verbose "Set target to $targetname" return 0 } -- 2.30.2