[binutils-gdb] [gdb/testsuite] Fix gdb.mi/mi-disassemble.exp with -m32

[Tom de Vries <vries@sourceware.org>]

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=0ffa92773a25042d97a6df74062270a03cb84982

commit 0ffa92773a25042d97a6df74062270a03cb84982
Author: Tom de Vries <tdevries@suse.de>
Date:   Thu Oct 13 09:43:23 2022 +0200

    [gdb/testsuite] Fix gdb.mi/mi-disassemble.exp with -m32
    
    With target board unix/-m32 and test-case gdb.mi/mi-disassemble.exp we have:
    ...
    (gdb) ^M
    print/x *((unsigned char *) 0x8048485)^M
    &"print/x *((unsigned char *) 0x8048485)\n"^M
    ~"$9 = 0x83\n"^M
    ^done^M
    (gdb) ^M
    PASS: gdb.mi/mi-disassemble.exp: get valueof "*((unsigned char *) 0x8048485)"
    FAIL: gdb.mi/mi-disassemble.exp: byte at 0x8048485 matches
    ...
    The test-case passes with native.
    
    With native we see in gdb.log that variable longest_insn_bytes is:
    ...
    Longest instruction at 0x0000000000400549 with bytes '48 8b 05 20 01 00 00'
    ...
    and variable split_bytes (added debug puts) ends up as:
    ...
    SPLIT_BYTES: 48 8b 05 20 01 00 00
    ...
    
    But with unix/-m32 we have longest_insn_byte:
    ...
    Longest instruction at 0x08048481 with bytes '8d 4c 24 04        '
    ...
    and split_bytes ends up as:
    ...
    SPLIT_BYTES: 8d 4c 24 04 {} {} {} {} {} {} {} {}
    ...
    so the trailing whitespace is translated by split to empty bytes, and the
    mismatch FAILs are generated for those.
    
    Fix this by stripping the whitespace, which makes us end up with a different
    and indeed longer insn:
    ...
    Longest instruction at 0x08048492 with bytes 'dd 05 98 85 04 08'
    ...
    
    Tested on x86_64-linux, with native and target board unix/-m32.

Diff:
---
 gdb/testsuite/gdb.mi/mi-disassemble.exp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gdb/testsuite/gdb.mi/mi-disassemble.exp b/gdb/testsuite/gdb.mi/mi-disassemble.exp
index 4d7c2f2e6e7..cac3689071c 100644
--- a/gdb/testsuite/gdb.mi/mi-disassemble.exp
+++ b/gdb/testsuite/gdb.mi/mi-disassemble.exp
@@ -284,7 +284,7 @@ proc test_disassembly_opcode_format {} {
 
 	-re "^~\".. ($::hex) <\[^>\]+>:\\\\t(\[^\\\\\]+)\\\\t\[^\r\n\]+\r\n" {
 	    set addr $expect_out(1,string)
-	    set bytes $expect_out(2,string)
+	    set bytes [string trim $expect_out(2,string)]
 	    if { [string length $bytes] > [string length $longest_insn_bytes] } {
 		set longest_insn_addr $addr
 		set longest_insn_bytes $bytes