[pushed] gdb.gdb/selftest.exp, Use multi_line to build gdb's expected startup output (Re: [PATCH, testsuite] Update gdb startup text in selftest.exp)

[Pedro Alves <palves@redhat.com>]

On 06/13/2018 12:49 PM, Pedro Alves wrote:

> That test could be made a lot more readable with use of multi_line.

I've pushed this in.

From 11ae5818f76e0af4dcf7ee069e0756ccf6901ebe Mon Sep 17 00:00:00 2001
From: Pedro Alves <palves@redhat.com>
Date: Thu, 14 Jun 2018 12:25:41 +0100
Subject: [PATCH] gdb.gdb/selftest.exp, Use multi_line to build gdb's expected
 startup output

This regex had to be touched at least twice these past few days.  Use
multi_line to make it more readable.

Note this also tightens the regex a little bit in some spots.

gdb/testsuite/ChangeLog:
2018-06-14  Pedro Alves  <palves@redhat.com>

	* gdb.gdb/selftest.exp (test_with_self): Use multi_line to build
	gdb's expected startup output.
---
 gdb/testsuite/ChangeLog            |  5 +++++
 gdb/testsuite/gdb.gdb/selftest.exp | 11 ++++++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index fd6b8fcbf2f..aa568a8343f 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2018-06-14  Pedro Alves  <palves@redhat.com>
+
+	* gdb.gdb/selftest.exp (test_with_self): Use multi_line to build
+	gdb's expected startup output.
+
 2018-06-14  Pedro Alves  <palves@redhat.com>
 
 	* lib/selftest-support.exp (selftest_setup): Remove inlined
diff --git a/gdb/testsuite/gdb.gdb/selftest.exp b/gdb/testsuite/gdb.gdb/selftest.exp
index 314bddb8bf2..3b200a28c53 100644
--- a/gdb/testsuite/gdb.gdb/selftest.exp
+++ b/gdb/testsuite/gdb.gdb/selftest.exp
@@ -63,10 +63,19 @@ proc test_with_self { } {
 	# Wait a bit while the inferior gdb gets to its prompt.
 	sleep 1
     } else {
+	set banner [multi_line \
+			"GNU gdb \[0-9\.\]*\[^\r\n\]*" \
+			"Copyright \\(C\\) \[0-9\]* Free Software Foundation, Inc\." \
+			"License GPLv3\\+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>" \
+			"This is free software: you are free to change and redistribute it\." \
+			"There is NO WARRANTY, to the extent permitted by law\." \
+			"Type \"show copying\" and \"show warranty\" for details\." \
+			"This GDB was configured as .*" \
+			"$gdb_prompt $"]
 	set test "xgdb is at prompt"
 	gdb_test_multiple "continue" $test {
 	    -i "$inferior_spawn_id"
-	    -re "GNU gdb \[0-9\.\]*.*Copyright \\(C\\) \[0-9\]* Free Software Foundation, Inc.*License GPLv3\\+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>.*This is free software: you are free to change and redistribute it.*There is NO WARRANTY, to the extent permitted by law\..*Type \"show copying\".*and \"show warranty\" for details.*This GDB was configured as .*$gdb_prompt $" {
+	    -re "$banner" {
 		pass $test
 	    }
 	}
-- 
2.14.3