From fef1b2933d911476c52418ae7c207d94e13ebb97 Mon Sep 17 00:00:00 2001
From: Tom Tromey <tom@tromey.com>
Date: Thu, 4 Oct 2018 11:01:53 -0600
Subject: [PATCH] Avoid pagination in attach.exp

While re-testing the complaint series, I saw some unresolved tests in
attach.exp.  In particular, the tests were failing because the pager
was active.

This is partly a new problem, introduced because that series changes
some prints from unfiltered to filtered.  However, it is also a latent
bug, which you can see by shrinking your window very small and then
running the test.

This patch avoids the problem by passing -quiet to gdb and arranging
to set the window height and width in one other test.

Arguably instead of -quiet we should disable the pager during gdb's
welcome message.  I can do that if it seems desirable; but meanwhile
this patch is safe.

gdb/testsuite/ChangeLog
2018-10-04  Tom Tromey  <tom@tromey.com>

	* gdb.base/attach.exp (test_command_line_attach_run): Use -quiet;
	set width and height to 0.
	(test_command_line_attach_run): Use -quiet.
---
 gdb/testsuite/ChangeLog           | 6 ++++++
 gdb/testsuite/gdb.base/attach.exp | 5 +++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 49945931e29..8d7af7433aa 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2018-10-04  Tom Tromey  <tom@tromey.com>
+
+	* gdb.base/attach.exp (test_command_line_attach_run): Use -quiet;
+	set width and height to 0.
+	(test_command_line_attach_run): Use -quiet.
+
 2018-10-03  Sandra Loosemore  <sandra@codesourcery.com>
 
 	* lib/gdb.exp (skip_ifunc_tests): New.
diff --git a/gdb/testsuite/gdb.base/attach.exp b/gdb/testsuite/gdb.base/attach.exp
index 8199a80c6b9..3f3a0edbb9d 100644
--- a/gdb/testsuite/gdb.base/attach.exp
+++ b/gdb/testsuite/gdb.base/attach.exp
@@ -376,7 +376,8 @@ proc do_command_attach_tests {} {
 
     gdb_exit
 
-    set res [gdb_spawn_with_cmdline_opts "--pid=$testpid"]
+    set res [gdb_spawn_with_cmdline_opts \
+		 "-quiet -iex \"set height 0\" -iex \"set width 0\" --pid=$testpid"]
     set test "starting with --pid"
     gdb_test_multiple "" $test {
 	-re "Reading symbols from.*$gdb_prompt $" {
@@ -408,7 +409,7 @@ proc test_command_line_attach_run {} {
 	gdb_exit
 
 	set res [gdb_spawn_with_cmdline_opts \
-		     "-iex \"set height 0\" -iex \"set width 0\" --pid=$testpid -ex \"start\""]
+		     "-quiet -iex \"set height 0\" -iex \"set width 0\" --pid=$testpid -ex \"start\""]
 	if { $res != 0} {
 	    fail $test
 	    kill_wait_spawned_process $test_spawn_id