From 955b0ef98ea757bad1b9be429e4b8d13689da13b Mon Sep 17 00:00:00 2001 From: Philippe Blain Date: Sun, 20 Feb 2022 11:49:12 -0500 Subject: [PATCH] gdb/testsuite/README: point to default value of INTERNAL_GDBFLAGS The INTERNAL_GDBFLAGS runtest variable was updated in 55c3ad88013 ([gdb/testsuite] Prevent pagination in GDB_INTERNALFLAGS, 2020-10-26) to disable pagination, and in aae1c79a03a (PR python/12227..., 2010-12-07) to point to the data directory, but its default value mentioned in the testsuite's README was not kept up to date. To avoid it getting out of sync even more, point the reader to the definition of the variable in lib/gdb.exp, and move the explanation of the different flags there. Also adjust the example in the README so it follows the flags added in 55c3ad88013. Change-Id: I3533608a7d6ae5198af09c7dc7743bde24c19ed7 --- gdb/testsuite/README | 12 +++++------- gdb/testsuite/lib/gdb.exp | 4 ++++ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/gdb/testsuite/README b/gdb/testsuite/README index 7552774c78b..c2f659a7188 100644 --- a/gdb/testsuite/README +++ b/gdb/testsuite/README @@ -167,12 +167,7 @@ checks both the installed GDB and GDBserver. INTERNAL_GDBFLAGS Command line options passed to all GDB invocations. - -The default is "-nw -nx". - -`-nw' disables any of the windowed interfaces. -`-nx' disables ~/.gdbinit, so that it doesn't interfere with -the tests. +The default is set in lib/gdb.exp. This is actually considered an internal variable, and you won't normally want to change it. However, in some situations, @@ -193,7 +188,10 @@ a .gdbinit. For example: HOME=`pwd` runtest \ GDB=/usr/bin/gdb \ GDBSERVER=/usr/bin/gdbserver \ - INTERNAL_GDBFLAGS=-nw + INTERNAL_GDBFLAGS="-nw -iex 'set height 0' -iex 'set width 0'" + +Note that we do not need to specify '-data-directory' here +as we are testing an installed GDB. GDB_PARALLEL diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp index a3717a40229..0cec46731bb 100644 --- a/gdb/testsuite/lib/gdb.exp +++ b/gdb/testsuite/lib/gdb.exp @@ -129,6 +129,10 @@ verbose "using GDBFLAGS = $GDBFLAGS" 2 set BUILD_DATA_DIRECTORY "[pwd]/../data-directory" # INTERNAL_GDBFLAGS contains flags that the testsuite requires. +# `-nw' disables any of the windowed interfaces. +# `-nx' disables ~/.gdbinit, so that it doesn't interfere with the tests. +# `-data-directory' points to the data directory in the build directory. +# `-iex "set {height,width} 0"' disables pagination. global INTERNAL_GDBFLAGS if ![info exists INTERNAL_GDBFLAGS] { set INTERNAL_GDBFLAGS \ -- 2.30.2