This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
Re: [PATCH] Clear GREP_OPTIONS environment variable.
On 17/03/2011 09:11, Andrew Burgess wrote:
>
> gdb/testsuite/ChangeLog
>
> 2011-03-15 Andrew Burgess<aburgess@broadcom.com>
>
> * lib/gdb.exp (default_gdb_start,gdb_init): Clear the GREP_OPTIONS
> environment variable to make grep output more predictable. Move
> all the environment setup into gdb_init so it's done once per test
> case rather than each time we start gdb.
I committed the second version of this patch with a tiny modification, removing the "global env" line from default_gdb_start as it's no longer needed. No test regressions here.
Cheers,
Andrew
Patch as committed:
Index: ./gdb/testsuite/lib/gdb.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/lib/gdb.exp,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -p -r1.168 -r1.169
--- ./gdb/testsuite/lib/gdb.exp 15 Mar 2011 16:41:42 -0000 1.168
+++ ./gdb/testsuite/lib/gdb.exp 25 Mar 2011 13:08:11 -0000 1.169
@@ -1311,25 +1311,9 @@ proc default_gdb_start { } {
global gdb_prompt
global timeout
global gdb_spawn_id;
- global env
gdb_stop_suppressing_tests;
- set env(LC_CTYPE) C
-
- # 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.
- set env(INPUTRC) "/dev/null"
-
- # The gdb.base/readline.exp arrow key test relies on the standard VT100
- # bindings, so make sure that an appropriate terminal is selected.
- # The same bug doesn't show up if we use ^P / ^N instead.
- set env(TERM) "vt100"
-
verbose "Spawning $GDB $INTERNAL_GDBFLAGS $GDBFLAGS"
if [info exists gdb_spawn_id] {
@@ -2796,11 +2780,30 @@ proc gdb_init { args } {
set banned_variables_traced 1
}
- # We set LC_ALL and LANG to C so that we get the same messages as
- # expected.
+ # We set LC_ALL, LC_CTYPE, and LANG to C so that we get the same
+ # messages as expected.
setenv LC_ALL C
+ setenv LC_CTYPE C
setenv LANG C
+ # 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.
+ setenv INPUTRC "/dev/null"
+
+ # The gdb.base/readline.exp arrow key test relies on the standard VT100
+ # bindings, so make sure that an appropriate terminal is selected.
+ # The same bug doesn't show up if we use ^P / ^N instead.
+ setenv TERM "vt100"
+
+ # Some tests (for example gdb.base/maint.exp) shell out from gdb to use
+ # grep. Clear GREP_OPTIONS to make the behavoiur predictable,
+ # especially having color output turned on can cause tests to fail.
+ setenv GREP_OPTIONS ""
+
return [eval default_gdb_init $args];
}