From mboxrd@z Thu Jan 1 00:00:00 1970 From: Kevin Buettner To: Fernando Nasser Cc: gdb-patches@sources.redhat.com Subject: Re: [PATCH RFA] gdb.base/completion.exp: Set INPUTRC env variable Date: Tue, 29 May 2001 20:22:00 -0000 Message-id: <1010530032139.ZM29206@ocotillo.lan> References: <1010518235834.ZM16437@ocotillo.lan> <3B0C56B9.567986F1@redhat.com> X-SW-Source: 2001-05/msg00485.html On May 23, 8:32pm, Fernando Nasser wrote: > But we need to make sure tests do not interfere with others. So, what > we always do (I hope) when changing globals inside the scope of a test > is to save the global value, set to whatever the test wants it to be, > change it back at the end. In this case, you can test if the element > INPUTRC of the global array "env" exists and, if it does, save it's > previous value. > > However, I can't think of anything else wanting to set or being > influenced by INPUTRC, so maybe we can be lazy this time and just check > your patch as is -- better add a FIXME or a NOTE to this fact at least. > If you feel confident that this is so, please go ahead and check it in. I do feel confident that nothing else (at the moment) cares about the value of INPUTRC. However, it seems like a better practice to save/restore the value of the variable as you've suggested, so that is what I've done. I've just committed the patch below. I do not regard myself as a Tcl expert, so I would appreciate it if someone else would look over this patch to make sure that I did things properly. * gdb.base/completion.exp (INPUTRC): Set this environment variable to a known value in order to get consistent results regardless of the setting of INPUTRC or the presence or contents of .inputrc. Index: testsuite/gdb.base/completion.exp =================================================================== RCS file: /cvs/src/src/gdb/testsuite/gdb.base/completion.exp,v retrieving revision 1.3 diff -u -p -r1.3 completion.exp --- completion.exp 2001/05/11 19:53:38 1.3 +++ completion.exp 2001/05/30 02:50:33 @@ -72,6 +72,19 @@ if [get_compiler_info ${binfile}] { } gdb_exit + +# Don't let a .inputrc file or an existing setting of INPUTRC mess up +# the test results. Even if /dev/null doesn't exist on the particular +# platform, the readline library will use the default setting just by +# failing to open the file. OTOH, opening /dev/null successfully will +# also result in the default settings being used since nothing will be +# read from this file. +global env +if [info exists env(INPUTRC)] { + set old_inputrc $env(INPUTRC) +} +set env(INPUTRC) "/dev/null" + gdb_start gdb_reinitialize_dir $srcdir/$subdir gdb_load ${binfile} @@ -596,19 +609,12 @@ gdb_expect { timeout { fail "(timeout) complete 'set follow-fork-mode'" } } +# Restore globals modified in this test... +if [info exists old_inputrc] { + set env(INPUTRC) $old_inputrc +} else { + unset env(INPUTRC) +} set timeout $oldtimeout1 -return 0 - - - - - - - - - - - - - +return 0