[gdb/testsuite] Fix gdb.btrace/reconnect.exp with native-gdbserver

Message ID 20190418214700.GA10515@delia
State New, archived
Headers

Commit Message

Tom de Vries April 18, 2019, 9:47 p.m. UTC
  Hi,

When running gdb.btrace/reconnect.exp with native-gdbserver, we run into:
...
FAIL: gdb.btrace/reconnect.exp: first: stepi 19
...
due to the fact that we're trying to match:
...
stepi 19^M
0x00007ffff7dd8b57 in _dl_start () from /lib64/ld-linux-x86-64.so.2^M
...
using pattern:
...
  gdb_test "stepi 19" "0x.* in .* from target.*"
...

Fix this by changing the pattern to:
...
  gdb_test "stepi 19" "0x.* in .* from .*"
...

Tested on x86_64-linux with native and native-gdbserver.

OK for trunk?

Thanks,
- Tom

[gdb/testsuite] Fix gdb.btrace/reconnect.exp with native-gdbserver

gdb/testsuite/ChangeLog:

2019-04-18  Tom de Vries  <tdevries@suse.de>

	PR gdb/24433
	* gdb.btrace/reconnect.exp: Fix stepi 19 pattern.

---
 gdb/testsuite/gdb.btrace/reconnect.exp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
  

Comments

Tom de Vries April 23, 2019, 1:51 p.m. UTC | #1
Committed as obvious.

Thanks,
- Tom

On 18-04-19 23:47, Tom de Vries wrote:
> Hi,
> 
> When running gdb.btrace/reconnect.exp with native-gdbserver, we run into:
> ...
> FAIL: gdb.btrace/reconnect.exp: first: stepi 19
> ...
> due to the fact that we're trying to match:
> ...
> stepi 19^M
> 0x00007ffff7dd8b57 in _dl_start () from /lib64/ld-linux-x86-64.so.2^M
> ...
> using pattern:
> ...
>   gdb_test "stepi 19" "0x.* in .* from target.*"
> ...
> 
> Fix this by changing the pattern to:
> ...
>   gdb_test "stepi 19" "0x.* in .* from .*"
> ...
> 
> Tested on x86_64-linux with native and native-gdbserver.
> 
> OK for trunk?
> 
> Thanks,
> - Tom
> 
> [gdb/testsuite] Fix gdb.btrace/reconnect.exp with native-gdbserver
> 
> gdb/testsuite/ChangeLog:
> 
> 2019-04-18  Tom de Vries  <tdevries@suse.de>
> 
> 	PR gdb/24433
> 	* gdb.btrace/reconnect.exp: Fix stepi 19 pattern.
> 
> ---
>  gdb/testsuite/gdb.btrace/reconnect.exp | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/gdb/testsuite/gdb.btrace/reconnect.exp b/gdb/testsuite/gdb.btrace/reconnect.exp
> index c4b41fc1bd..e791657e7a 100644
> --- a/gdb/testsuite/gdb.btrace/reconnect.exp
> +++ b/gdb/testsuite/gdb.btrace/reconnect.exp
> @@ -51,7 +51,7 @@ gdb_target_cmd $gdbserver_protocol $gdbserver_gdbport
>  # Create a record, check, reconnect
>  with_test_prefix "first" {
>    gdb_test_no_output "record btrace" "record btrace enable"
> -  gdb_test "stepi 19" "0x.* in .* from target.*"
> +  gdb_test "stepi 19" "0x.* in .* from .*"
>  
>    gdb_test "info record" [multi_line \
>      "Active record target: .*" \
>
  

Patch

diff --git a/gdb/testsuite/gdb.btrace/reconnect.exp b/gdb/testsuite/gdb.btrace/reconnect.exp
index c4b41fc1bd..e791657e7a 100644
--- a/gdb/testsuite/gdb.btrace/reconnect.exp
+++ b/gdb/testsuite/gdb.btrace/reconnect.exp
@@ -51,7 +51,7 @@  gdb_target_cmd $gdbserver_protocol $gdbserver_gdbport
 # Create a record, check, reconnect
 with_test_prefix "first" {
   gdb_test_no_output "record btrace" "record btrace enable"
-  gdb_test "stepi 19" "0x.* in .* from target.*"
+  gdb_test "stepi 19" "0x.* in .* from .*"
 
   gdb_test "info record" [multi_line \
     "Active record target: .*" \