From f1af7b94c16029f2c6da9eae4076f64cd9383687 Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Thu, 30 Nov 2017 11:39:31 -0500 Subject: [PATCH] Use boards/local-board.exp more local-board.exp was introduced recently, containing the code required to force the gdbserver boards to be non-remote (from the DejaGNU point of view). Other board files use the same trick of forcing isremote to 0. Instead of doing it by hand in each file, include local-board.exp. gdb/testsuite/ChangeLog: * boards/cc-with-tweaks.exp: Include local-board.exp instead of setting isremote by hand. * boards/dwarf4-gdb-index.exp: Likewise. * boards/fission.exp: Likewise. * boards/stabs.exp: Likewise. --- gdb/testsuite/ChangeLog | 8 ++++++++ gdb/testsuite/boards/cc-with-tweaks.exp | 5 +---- gdb/testsuite/boards/dwarf4-gdb-index.exp | 5 +---- gdb/testsuite/boards/fission.exp | 6 ++---- gdb/testsuite/boards/stabs.exp | 6 ++---- 5 files changed, 14 insertions(+), 16 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 5b8151d..c1cd966 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,11 @@ +2017-11-30 Simon Marchi + + * boards/cc-with-tweaks.exp: Include local-board.exp instead of + setting isremote by hand. + * boards/dwarf4-gdb-index.exp: Likewise. + * boards/fission.exp: Likewise. + * boards/stabs.exp: Likewise. + 2017-11-30 Pedro Alves * gdb.linespec/cpls-ops.exp diff --git a/gdb/testsuite/boards/cc-with-tweaks.exp b/gdb/testsuite/boards/cc-with-tweaks.exp index 794217c..bdffdab 100644 --- a/gdb/testsuite/boards/cc-with-tweaks.exp +++ b/gdb/testsuite/boards/cc-with-tweaks.exp @@ -30,10 +30,7 @@ if ![info exists CC_WITH_TWEAKS_FLAGS] { } # This is needed otherwise dejagnu tries to rsh to host "cc-with-tweaks". -# set_board_info only sets the value if not already set. -# find_gcc checks for this, so set early. -unset_board_info isremote -set_board_info isremote 0 +load_board_description "local-board" # This is based on baseboards/unix.exp. # At the moment we only support systems that unix.exp supports. diff --git a/gdb/testsuite/boards/dwarf4-gdb-index.exp b/gdb/testsuite/boards/dwarf4-gdb-index.exp index 09c9c98..ea4f47a 100644 --- a/gdb/testsuite/boards/dwarf4-gdb-index.exp +++ b/gdb/testsuite/boards/dwarf4-gdb-index.exp @@ -20,10 +20,7 @@ # bash$ make check RUNTESTFLAGS='--target_board=dwarf4-gdb-index' # This is needed otherwise dejagnu tries to rsh to host "dwarf4-gdb-index". -# set_board_info only sets the value if not already set. -# find_gcc checks for this, so set early. -unset_board_info isremote -set_board_info isremote 0 +load_board_description "local-board" # This is based on baseboards/unix.exp. # At the moment we only support systems that unix.exp supports. diff --git a/gdb/testsuite/boards/fission.exp b/gdb/testsuite/boards/fission.exp index 1eb89de..4a62ed9 100644 --- a/gdb/testsuite/boards/fission.exp +++ b/gdb/testsuite/boards/fission.exp @@ -31,7 +31,5 @@ set_board_info compiler "[find_gcc]" # -gsplit-dwarf implies -ggnu-pubnames for gcc, it doesn't for clang. set_board_info debug_flags "-gdwarf-4 -gsplit-dwarf -ggnu-pubnames -fdebug-types-section -Wl,--gdb-index" -# This is needed otherwise dejagnu tries to rsh to host "fission". Blech. -# Double blech: set_board_info only sets the value if not already set. -unset_board_info isremote -set_board_info isremote 0 +# This is needed otherwise dejagnu tries to rsh to host "fission". +load_board_description "local-board" diff --git a/gdb/testsuite/boards/stabs.exp b/gdb/testsuite/boards/stabs.exp index cbf34d2..57de1e6 100644 --- a/gdb/testsuite/boards/stabs.exp +++ b/gdb/testsuite/boards/stabs.exp @@ -39,7 +39,5 @@ set_board_info compiler "[find_gcc]" # Use -gstabs+ instead of -gstabs for better c++ support. set_board_info debug_flags "-gstabs+" -# This is needed otherwise dejagnu tries to rsh to host "stabs". Blech. -# Double blech: set_board_info only sets the value if not already set. -unset_board_info isremote -set_board_info isremote 0 +# This is needed otherwise dejagnu tries to rsh to host "stabs". +load_board_description "local-board" -- 2.7.4