OpenE2K/binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gdb.gdb/selftest.exp, Use multi_line to build gdb's expected startup output

Browse Source 
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.
This commit is contained in:
Pedro Alves 2018-06-14 12:25:41 +01:00
parent a898ca0e0c
commit 11ae5818f7
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gdb/testsuite/ChangeLog
View File

@ -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

11
gdb/testsuite/gdb.gdb/selftest.exp
View File

@ -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
}
}