[committed,gdb/testsuite] Fix unset of DEBUGINFOD_URLS in default_gdb_init

Message ID 20210401062449.GA8387@delia
State New
Headers show
  • [committed,gdb/testsuite] Fix unset of DEBUGINFOD_URLS in default_gdb_init
Related show

Commit Message

Tom de Vries April 1, 2021, 6:24 a.m.

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.

Committed to trunk.

- Tom

[gdb/testsuite] Fix unset of DEBUGINFOD_URLS in default_gdb_init

2021-04-01  Tom de Vries  <tdevries@suse.de>

	* 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)] } {
-    }
+    unset -nocomplain ::env(DEBUGINFOD_URLS)
     # Ensure that GDBHISTFILE and GDBHISTSIZE are removed from the
     # environment, we don't want these modifications to the history