GDB 7.6.50

gdb/testsuite/gdb.arch/i386-bp_permanent.exp

Index: gdb/testsuite/gdb.arch/i386-bp_permanent.exp
diff --git a/gdb/testsuite/gdb.arch/i386-bp_permanent.exp b/gdb/testsuite/gdb.arch/i386-bp_permanent.exp
index 026f956df9f13712dcd068e1c356ebeebf1f6ba4..491a69205342b825355eae587d3f9f9e40a23a37 100644
--- a/gdb/testsuite/gdb.arch/i386-bp_permanent.exp
+++ b/gdb/testsuite/gdb.arch/i386-bp_permanent.exp
@@ -1,4 +1,4 @@
-# Copyright (C) 2008-2012 Free Software Foundation, Inc.
+# Copyright (C) 2008-2013 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,7 +18,7 @@
 
 # Test stepping over permanent breakpoints on i386.
 
-if {(![istarget "x86_64-*-*"] && ![istarget "i?86-*-*"]) || ![is_ilp32_target] } then {
+if { ![is_x86_like_target] } then {
     verbose "Skipping skip over permanent breakpoint on i386 tests."
     return
 }
@@ -55,10 +55,10 @@ set function standard
 
 set retcode [gdb_test_multiple "disassemble $function" "Disassemble function '$function'" {
     -re ".*($hex) <\\+0>.*($hex) <\\+4>.*($hex) <\\+5>.*($hex) <\\+6>.*$gdb_prompt $" {
-      set function_start $expect_out(1,string);
-      set address $expect_out(2,string);
-      set address1 $expect_out(3,string);
-      set address2 $expect_out(4,string);
+      set function_start $expect_out(1,string)
+      set address $expect_out(2,string)
+      set address1 $expect_out(3,string)
+      set address2 $expect_out(4,string)
     }
 }]
 
@@ -81,7 +81,7 @@ gdb_test "continue" "Breakpoint .*, $function_start in $function.*" \
 set start_esp 0
 gdb_test_multiple "print \$esp" "Fetch esp value." {
     -re "\\\$1.*($hex).*$gdb_prompt $" {
-      set start_esp $expect_out(1,string);
+      set start_esp $expect_out(1,string)
     }
 }