From 84838a61666fbc412119f544e6973ab59dd510a4 Mon Sep 17 00:00:00 2001 From: Tom de Vries Date: Thu, 1 Apr 2021 08:24:13 +0200 Subject: [PATCH] [gdb/testsuite] Fix unset of DEBUGINFOD_URLS in default_gdb_init In commit cfcbd506fb0 "[gdb/testsuite] Ignore DEBUGINFOD_URLS" I added unsetting of env(DEBUGINFOD_URLS), but it doesn't work because I forgot to add :: in front. Fix this, and rewrite using "unset -nocomplain" instead of unsetenv, which allows us to drop the "info exists" test. 2021-04-01 Tom de Vries * lib/gdb.exp (default_gdb_init): Use ::env. Use unset -nocomplain ::env(V) instead of unsetenv V. --- gdb/testsuite/lib/gdb.exp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp index 3cdc39dc819..943112fcc80 100644 --- a/gdb/testsuite/lib/gdb.exp +++ b/gdb/testsuite/lib/gdb.exp @@ -5272,9 +5272,7 @@ proc default_gdb_init { test_file_name } { # If DEBUGINFOD_URLS is set, gdb will try to download sources and # debug info for f.i. system libraries. Prevent this. - if { [info exists env(DEBUGINFOD_URLS)] } { - unsetenv DEBUGINFOD_URLS - } + unset -nocomplain ::env(DEBUGINFOD_URLS) # Ensure that GDBHISTFILE and GDBHISTSIZE are removed from the # environment, we don't want these modifications to the history -- 2.30.2