From e453275cdcb28f3ca70ecb90d7aec51272a7a4f9 Mon Sep 17 00:00:00 2001 From: Tom de Vries Date: Thu, 27 May 2021 15:22:38 +0200 Subject: [PATCH] [gdb/testsuite] Prevent proc override in gdb-index.exp When running these two test-cases in this specific order we get: ... $ make check 'RUNTESTFLAGS=gdb.dwarf2/gdb-index.exp \ gdb.dwarf2/gdb-add-index-symlink.exp' ... Running gdb.dwarf2/gdb-index.exp ... Running gdb.dwarf2/gdb-add-index-symlink.exp ... FAIL: gdb.dwarf2/gdb-add-index-symlink.exp: gdb-index file created FAIL: gdb.dwarf2/gdb-add-index-symlink.exp: Unable to call \ gdb-add-index with a symlink to a symfile ... The problem is that gdb-index.exp introduces a proc add_gdb_index which overrides the one in lib/gdb.exp and stays active after the test is done. Consequently it's used in gdb-add-index-symlink.exp, which should use the one from lib/gdb.exp. Fix this by renaming proc add_gdb_index in gdb-index.exp. Tested on x86_64-linux. gdb/testsuite/ChangeLog: 2021-05-27 Tom de Vries PR testsuite/27921 * gdb.dwarf2/gdb-index.exp (add_gdb_index): Rename to ... (local_add_gdb_index): ... this. --- gdb/testsuite/ChangeLog | 6 ++++++ gdb/testsuite/gdb.dwarf2/gdb-index.exp | 5 +++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index df1ba09d502..968e623db40 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2021-05-27 Tom de Vries + + PR testsuite/27921 + * gdb.dwarf2/gdb-index.exp (add_gdb_index): Rename to ... + (local_add_gdb_index): ... this. + 2021-05-21 Tom de Vries PR testsuite/25047 diff --git a/gdb/testsuite/gdb.dwarf2/gdb-index.exp b/gdb/testsuite/gdb.dwarf2/gdb-index.exp index 3807c75294f..0b7adb5379d 100644 --- a/gdb/testsuite/gdb.dwarf2/gdb-index.exp +++ b/gdb/testsuite/gdb.dwarf2/gdb-index.exp @@ -31,8 +31,9 @@ if { [prepare_for_testing "failed to prepare" "${testfile}" \ # PROGRAM is assumed to be the output of standard_output_file. # Returns the path of the program or "" if there is a failure. # If there is a failure it will have already been logged. +# Use local prefix to prevent overriding add_gdb_index from lib/gdb.exp. -proc add_gdb_index { program } { +proc local_add_gdb_index { program } { set index_file ${program}.gdb-index set dir [file dirname ${program}] set filename [file tail ${program}] @@ -90,7 +91,7 @@ gdb_test_multiple "mt print objfiles ${testfile}" $test { set binfile_with_index $binfile } -re "Psymtabs.*${gdb_prompt} $" { - set binfile_with_index [add_gdb_index $binfile] + set binfile_with_index [local_add_gdb_index $binfile] if { ${binfile_with_index} == "" } { return -1 } -- 2.30.2