From ee4c3d88019ed88c3110e22cda16891aed14f818 Mon Sep 17 00:00:00 2001 From: Tom de Vries Date: Wed, 10 Feb 2021 11:43:46 +0100 Subject: [PATCH] [gdb/testsuite] Fix tcl ERROR in gdb_load_no_complaints In commit cf2b2075299 "[gdb/symtab] Fix element type modification in read_array_type" I factored out new proc with_complaints out of proc gdb_load_no_complaints, but when fixing a rebase conflict pre-commit I made a mistake in gdb_load_no_complaints that is now causing: ... ERROR: tcl error sourcing dw2-ranges-psym.exp. ERROR: can't read "save": no such variable while executing "gdb_test_no_output "set complaints $save" """ (procedure "gdb_load_no_complaints" line 14) invoked from within "gdb_load_no_complaints $binfile" ... Fix this by removing the offending line. Tested on x86_64-linux. gdb/testsuite/ChangeLog: 2021-02-10 Tom de Vries * lib/gdb.exp (gdb_load_no_complaints): Remove unnecessary "Restore saved setting of complaints". --- gdb/testsuite/ChangeLog | 5 +++++ gdb/testsuite/lib/gdb.exp | 3 --- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 714c91f30ba..881f111b5d5 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2021-02-10 Tom de Vries + + * lib/gdb.exp (gdb_load_no_complaints): Remove unnecessary + "Restore saved setting of complaints". + 2021-02-09 Tom de Vries PR symtab/27341 diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp index 1406b917151..016c678237c 100644 --- a/gdb/testsuite/lib/gdb.exp +++ b/gdb/testsuite/lib/gdb.exp @@ -5149,9 +5149,6 @@ proc gdb_load_no_complaints { arg } { # Verify that there were no complaints. set re "^Reading symbols from \[^\r\n\]*\r\n$gdb_prompt $" gdb_assert {[regexp $re $gdb_file_cmd_msg]} "No complaints" - - # Restore saved setting of complaints. - gdb_test_no_output "set complaints $save" "" } # gdb_reload -- load a file into the target. Called before "running", -- 2.30.2