From d618e4c51c73f2139a1aa8903d677a4202956f21 Mon Sep 17 00:00:00 2001
From: Patrick Palka <patrick@parcs.ath.cx>
Date: Wed, 29 Jul 2015 12:44:21 -0400
Subject: [PATCH] batch-preserve-term-settings.exp: use send_quit_command some
 more

Just a slight cleanup.  Committed as obvious.

gdb/testsuite/ChangeLog:

	* gdb.base/batch-preserve-term-settings.exp
	(test_terminal_settings_preserved_after_cli_exit): Use
	send_quit_command.
---
 gdb/testsuite/ChangeLog                        |  6 ++++++
 .../gdb.base/batch-preserve-term-settings.exp  | 18 +-----------------
 2 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 3722e287f16..171784e697f 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2015-07-29  Patrick Palka  <patrick@parcs.ath.cx>
+
+	* gdb.base/batch-preserve-term-settings.exp
+	(test_terminal_settings_preserved_after_cli_exit): Use
+	send_quit_command.
+
 2015-07-29  Pedro Alves  <palves@redhat.com>
 	    Don Breazeal  <donb@codesourcery.com>
 
diff --git a/gdb/testsuite/gdb.base/batch-preserve-term-settings.exp b/gdb/testsuite/gdb.base/batch-preserve-term-settings.exp
index a4c87967626..90f40576ddd 100644
--- a/gdb/testsuite/gdb.base/batch-preserve-term-settings.exp
+++ b/gdb/testsuite/gdb.base/batch-preserve-term-settings.exp
@@ -251,23 +251,7 @@ proc test_terminal_settings_preserved_after_cli_exit { cmds } {
 	}
     }
 
-    set test "quit gdb"
-    send_gdb "quit\n"
-    gdb_expect {
-	-re "(y or n)" {
-	    send_gdb "y\n"
-	    exp_continue
-	}
-	-re ".*$shell_prompt_re$" {
-	    pass $test
-	}
-	timeout {
-	    fail "$test (timeout)"
-	}
-	eof {
-	    fail "$test (eof)"
-	}
-    }
+    send_quit_command "quit gdb"
 
     set test "terminal settings preserved"
     if $stty_supported {
-- 
2.30.2