Merge GDB 7.5.1

gdb/testsuite/gdb.base/freebpcmd.exp

Index: gdb/testsuite/gdb.base/freebpcmd.exp
diff --git a/gdb/testsuite/gdb.base/freebpcmd.exp b/gdb/testsuite/gdb.base/freebpcmd.exp
index dd0ab4c3a4a58f217002f6b5b14fb620d5b5d23b..f969480edce80886d0b03c9f59f5a4ad3839db77 100644
--- a/gdb/testsuite/gdb.base/freebpcmd.exp
+++ b/gdb/testsuite/gdb.base/freebpcmd.exp
@@ -64,7 +64,10 @@ gdb_test "break ${srcfile}:[gdb_get_line_number "euphonium"]" ".*" \
 # The goal of all this is to make sure that there's plenty of memory
 # churn, and different amounts of it each time the inferior stops;
 # this seems to make GDB crash more reliably.
-set lines {{if (i%2) == 0}
+set lines {{if i<0 || i > 100}
+	   {echo Invalid i value\n}
+	   {else}
+	   {if (i%2) == 0}
            {echo "even "}
            {print i}
            {else}
@@ -81,6 +84,7 @@ set lines {{if (i%2) == 0}
            {if i != 40}
            {c}
            {end}
+	   {end}
            {end}}
 
 send_gdb "commands\n"
@@ -114,6 +118,9 @@ gdb_test_multiple "" "run program with breakpoint commands" {
     -re "warning: Invalid control type in command structure" {
         kfail "gdb/1489" "run program with breakpoint commands"
     }
+    -re "Invalid i value\r\n$gdb_prompt $" {
+	xfail "run program with breakpoint commands (i value not readable)"
+    }
     -re "$gdb_prompt $" {
         pass "run program with breakpoint commands"
     }