update copyright year range in GDB files

[external/binutils.git] / gdb / testsuite / gdb.arch / amd64-word.exp

diff --git a/gdb/testsuite/gdb.arch/amd64-word.exp b/gdb/testsuite/gdb.arch/amd64-word.exp
index 98116cb..be2f21d 100644 (file)
--- a/gdb/testsuite/gdb.arch/amd64-word.exp
+++ b/gdb/testsuite/gdb.arch/amd64-word.exp
@@ -1,4 +1,4 @@
-# Copyright 2010 Free Software Foundation, Inc.
+# Copyright 2010-2017 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -18,35 +18,24 @@
 
 # This file is part of the gdb testsuite.
 
-if $tracelevel {
-    strace $tracelevel
-}
-
-set prms_id 0
-set bug_id 0
 
-if { ![istarget x86_64-*-* ] } {
+if { ![istarget x86_64-*-* ] || ![is_lp64_target] } {
     verbose "Skipping amd64 word register tests."
     return
 }
 
-set testfile "amd64-word"
-set srcfile amd64-pseudo.c
-set binfile ${objdir}/${subdir}/${testfile}
+standard_testfile amd64-pseudo.c
 
-if [get_compiler_info ${binfile}] {
+if [get_compiler_info] {
     return -1
 }
 
 if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list debug]] != "" } {
-    untested ${testfile}
+    untested "failed to compile"
     return
 }
 
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
+clean_restart ${binfile}
 
 if ![runto_main] then {
     gdb_suppress_tests
@@ -74,9 +63,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 +75,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)"
 }