From 1be008824d66029ec5d7c1f1a32b25305dc50afa Mon Sep 17 00:00:00 2001
From: Doug Evans <dje@google.com>
Date: Fri, 5 Feb 2010 21:51:38 +0000
Subject: [PATCH] 	testsuite/ 	* lib/gdb.exp (INTERNAL_GDBFLAGS):
 Don't override value provided by 	user. 	doc/ 	* gdbint.texinfo
 (Testsuite): Document INTERNAL_GDBFLAGS.

---
 gdb/doc/ChangeLog         |  1 +
 gdb/doc/gdbint.texinfo    | 27 +++++++++++++++++++++++++++
 gdb/testsuite/ChangeLog   |  5 +++++
 gdb/testsuite/lib/gdb.exp |  5 ++++-
 4 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/gdb/doc/ChangeLog b/gdb/doc/ChangeLog
index 20c8b392ed..a3008b52fb 100644
--- a/gdb/doc/ChangeLog
+++ b/gdb/doc/ChangeLog
@@ -2,6 +2,7 @@
 
 	* gdbint.texinfo (Testsuite): Add a new section to document the
 	various DejaGnu variables that may be overridden.
+	Document INTERNAL_GDBFLAGS.
 
 2010-02-04  Tom Tromey  <tromey@redhat.com>
 
diff --git a/gdb/doc/gdbint.texinfo b/gdb/doc/gdbint.texinfo
index 44e652a2dc..c90af0534f 100644
--- a/gdb/doc/gdbint.texinfo
+++ b/gdb/doc/gdbint.texinfo
@@ -7647,6 +7647,33 @@ different gdbserver.
 make check RUNTESTFLAGS="GDB=/usr/bin/gdb GDBSERVER=/usr/bin/gdbserver"
 @end smallexample
 
+@item @code{INTERNAL_GDBFLAGS}
+
+When running the testsuite normally one doesn't want whatever is in
+@file{~/.gdbinit} to interfere with the tests, therefore the test harness
+passes @option{-nx} to @value{GDBN}.  One also doesn't want any windowed
+version of @value{GDBN}, e.g., @command{gdbtui}, to run.
+This is achieved via @code{INTERNAL_GDBFLAGS}.  
+
+@smallexample
+set INTERNAL_GDBFLAGS "-nw -nx"
+@end smallexample
+
+This is all well and good, except when testing an installed @value{GDBN}
+that has been configured with @option{--with-system-gdbinit}.  Here one
+does not want @file{~/.gdbinit} loaded but one may want the system
+@file{.gdbinit} file loaded.  This can be achieved by pointing @code{$HOME}
+at a directory without a @file{.gdbinit} and by overriding
+@code{INTERNAL_GDBFLAGS} and removing @option{-nx}.
+
+@smallexample
+cd testsuite
+HOME=`pwd` runtest \
+  GDB=/usr/bin/gdb \
+  GDBSERVER=/usr/bin/gdbserver \
+  INTERNAL_GDBFLAGS=-nw
+@end smallexample
+
 @end itemize
 
 There are two ways to run the testsuite and pass additional parameters
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 022bcfa425..50b6966493 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2010-02-05  Doug Evans  <dje@google.com>
+
+	* lib/gdb.exp (INTERNAL_GDBFLAGS): Don't override value provided by
+	user.
+
 2010-02-05  Sami Wagiaalla  <swagiaal@redhat.com>
 
 	PR c++/7935:
diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp
index 9b06a2f750..0145afbd86 100644
--- a/gdb/testsuite/lib/gdb.exp
+++ b/gdb/testsuite/lib/gdb.exp
@@ -54,7 +54,10 @@ if ![info exists GDBFLAGS] {
 verbose "using GDBFLAGS = $GDBFLAGS" 2
 
 # INTERNAL_GDBFLAGS contains flags that the testsuite requires.
-set INTERNAL_GDBFLAGS "-nw -nx"
+global INTERNAL_GDBFLAGS
+if ![info exists INTERNAL_GDBFLAGS] {
+    set INTERNAL_GDBFLAGS "-nw -nx"
+}
 
 # The variable gdb_prompt is a regexp which matches the gdb prompt.
 # Set it if it is not already set.
-- 
2.34.1