diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 57f80b49b5..15fbbe1b47 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,13 @@ +2019-03-12 Andrew Burgess + + * config/default.exp: Remove 'load_lib gdb.exp'. + * config/monitor.exp: Likewise. + * config/sid.exp: Likewise. + * config/sim.exp: Likewise. + * config/slite.exp: Likewise. + * config/unix.exp: Likewise. + * gdb.base/default.exp: Remove unhelpful comment. + 2019-03-06 Andrew Burgess * gdb.fortran/type-kinds.exp: Extend to cover TYPE*SIZE cases. diff --git a/gdb/testsuite/config/default.exp b/gdb/testsuite/config/default.exp index 8b70ee4b50..325a58851e 100644 --- a/gdb/testsuite/config/default.exp +++ b/gdb/testsuite/config/default.exp @@ -13,4 +13,4 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -load_lib gdb.exp +# Nothing extra is needed here. diff --git a/gdb/testsuite/config/monitor.exp b/gdb/testsuite/config/monitor.exp index be8d8429b8..48a01feb70 100644 --- a/gdb/testsuite/config/monitor.exp +++ b/gdb/testsuite/config/monitor.exp @@ -14,9 +14,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -load_lib gdb.exp -# puts "***** DID USE MONITOR ******" - # # gdb_target_cmd # Send gdb the "target" command diff --git a/gdb/testsuite/config/sid.exp b/gdb/testsuite/config/sid.exp index 3c92a4fe9f..17a3ad568d 100644 --- a/gdb/testsuite/config/sid.exp +++ b/gdb/testsuite/config/sid.exp @@ -14,8 +14,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -load_lib gdb.exp - proc sid_start {} { global verbose diff --git a/gdb/testsuite/config/sim.exp b/gdb/testsuite/config/sim.exp index dafb1a2606..8d87e3089b 100644 --- a/gdb/testsuite/config/sim.exp +++ b/gdb/testsuite/config/sim.exp @@ -14,8 +14,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -load_lib gdb.exp - # # gdb_target_sim # Set gdb to target the simulator diff --git a/gdb/testsuite/config/slite.exp b/gdb/testsuite/config/slite.exp index 0fa472ee0c..ffbd9c811e 100644 --- a/gdb/testsuite/config/slite.exp +++ b/gdb/testsuite/config/slite.exp @@ -27,7 +27,7 @@ # rather than being displayed by gdb. load_lib remote.exp -load_lib gdb.exp + set gdb_prompt "\\(gdb\\)" # diff --git a/gdb/testsuite/config/unix.exp b/gdb/testsuite/config/unix.exp index 2ab1d9abf0..770e69b4c3 100644 --- a/gdb/testsuite/config/unix.exp +++ b/gdb/testsuite/config/unix.exp @@ -21,5 +21,3 @@ # does not seem to be enough. Try starting with 60. set timeout 60 verbose "Timeout is now $timeout seconds" 2 - -load_lib gdb.exp diff --git a/gdb/testsuite/gdb.base/default.exp b/gdb/testsuite/gdb.base/default.exp index 8a11401c79..ece1428e61 100644 --- a/gdb/testsuite/gdb.base/default.exp +++ b/gdb/testsuite/gdb.base/default.exp @@ -25,8 +25,6 @@ set timeout 60 # test default actions of gdb commands # -#load_lib gdb.exp - gdb_test "add-symbol-file" "add-symbol-file takes a file name and an address" "add-symbol-file" # test append