[gdb/testsuite] Fix gdb.base/define.exp with check-read1

When running gdb.base/define.exp with check-read1, we get:
...
show prompt^M
Gdb's prompt is "(gdb) ".^M
(gdb) PASS: gdb.base/define.exp: save gdb_prompt
set prompt \(blah\) ^M
(blah) PASS: gdb.base/define.exp: set gdb_prompt
set prompt (gdb) PASS: gdb.base/define.exp: reset gdb_prompt
^M
(gdb) FAIL: gdb.base/define.exp: define do-define
...

The problem is that the "$gdb_prompt $" regexp here:
...
gdb_test_multiple "set prompt $prior_prompt " "reset gdb_prompt" {
    -re "$gdb_prompt $" {
        pass "reset gdb_prompt"
    }
}
...
triggers for the echoing of the command "set prompt $prior_prompt " rather
than for the prompt after the command has executed.

Fix this by changing the regexp to "\r\n$gdb_prompt $".

Tested on x86_64-linux.

gdb/testsuite/ChangeLog:

2019-07-29  Tom de Vries  <tdevries@suse.de>

	* gdb.base/define.exp: Add "\r\n" to "reset gdb_prompt" regexp.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index f79dc9f71c3295a6c753ee56f4ebcb9addfa730d..ff6159e1109b0abb4cfd8a6b017559b401c70a59 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2019-07-29  Tom de Vries  <tdevries@suse.de>
+
+       * gdb.base/define.exp: Add "\r\n" to "reset gdb_prompt" regexp.
+
 2019-07-29  Tom de Vries  <tdevries@suse.de>
 
        PR gdb/24855

diff --git a/gdb/testsuite/gdb.base/define.exp b/gdb/testsuite/gdb.base/define.exp
index e8508b8728dcaa953fb861d481e0356ca5aeaa10..d7d4fd03ba528d1f93e05a677387c927280148cc 100644 (file)
--- a/gdb/testsuite/gdb.base/define.exp
+++ b/gdb/testsuite/gdb.base/define.exp
@@ -302,7 +302,7 @@ gdb_test_multiple "set prompt \\(blah\\) " "set gdb_prompt" {
 }
 
 gdb_test_multiple "set prompt $prior_prompt " "reset gdb_prompt" {
-    -re "$gdb_prompt $" {
+    -re "\r\n$gdb_prompt $" {
        pass "reset gdb_prompt"
     }
 }