diff options
| -rw-r--r-- | gdb/testsuite/ChangeLog | 4 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.arch/amd64-dword.exp | 8 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.arch/amd64-word.exp | 8 |
3 files changed, 12 insertions, 8 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 34ffc66..092593f 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,5 +1,9 @@ 2010-03-30 Doug Evans <dje@google.com> + * gdb.arch/amd64-word.exp: Rename hex to hexr, the former is defined + by dejagnu. + * gdb.arch/amd64-dword.exp: Ditto. + * gdb.base/annota1.exp (break handle_USR1): Make fail and pass text match. (break printf): Ditto. diff --git a/gdb/testsuite/gdb.arch/amd64-dword.exp b/gdb/testsuite/gdb.arch/amd64-dword.exp index 632e46b..f3ab6b9 100644 --- a/gdb/testsuite/gdb.arch/amd64-dword.exp +++ b/gdb/testsuite/gdb.arch/amd64-dword.exp @@ -74,9 +74,9 @@ gdb_test "break [gdb_get_line_number "first breakpoint here"]" \ gdb_continue_to_breakpoint "continue to first breakpoint in main" for { set r 1 } { $r <= 6 } { incr r } { - set hex [format %x $r] + set hexr [format %x $r] gdb_test "print/x \$$dword_regs($r)" \ - ".. = 0x${hex}4${hex}3${hex}2${hex}1" \ + ".. = 0x${hexr}4${hexr}3${hexr}2${hexr}1" \ "check contents of %$dword_regs($r)" } @@ -86,9 +86,9 @@ gdb_test "break [gdb_get_line_number "second breakpoint here"]" \ gdb_continue_to_breakpoint "continue to second breakpoint in main" for { set r 7 } { $r <= $nr_regs } { incr r } { - set hex [format %x $r] + set hexr [format %x $r] gdb_test "print/x \$$dword_regs($r)" \ - ".. = 0x${hex}4${hex}3${hex}2${hex}1" \ + ".. = 0x${hexr}4${hexr}3${hexr}2${hexr}1" \ "check contents of %$dword_regs($r)" } diff --git a/gdb/testsuite/gdb.arch/amd64-word.exp b/gdb/testsuite/gdb.arch/amd64-word.exp index 98116cb..a02edf9 100644 --- a/gdb/testsuite/gdb.arch/amd64-word.exp +++ b/gdb/testsuite/gdb.arch/amd64-word.exp @@ -74,9 +74,9 @@ gdb_test "break [gdb_get_line_number "first breakpoint here"]" \ gdb_continue_to_breakpoint "continue to first breakpoint in main" for { set r 1 } { $r <= 6 } { incr r } { - set hex [format %x $r] + set hexr [format %x $r] gdb_test "print/x \$$word_regs($r)" \ - ".. = 0x${hex}2${hex}1" \ + ".. = 0x${hexr}2${hexr}1" \ "check contents of %$word_regs($r)" } @@ -86,9 +86,9 @@ gdb_test "break [gdb_get_line_number "second breakpoint here"]" \ gdb_continue_to_breakpoint "continue to second breakpoint in main" for { set r 7 } { $r <= $nr_regs } { incr r } { - set hex [format %x $r] + set hexr [format %x $r] gdb_test "print/x \$$word_regs($r)" \ - ".. = 0x${hex}2${hex}1" \ + ".. = 0x${hexr}2${hexr}1" \ "check contents of %$word_regs($r)" } |