Merge GDB 7.5.1

gdb/testsuite/gdb.base/freebpcmd.exp

 #   Copyright 2003, 2007-2012 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
 # the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ skipping 46 matching lines @@
 gdb_start
 gdb_reinitialize_dir $srcdir/$subdir
 gdb_load ${binfile}
 
 gdb_test "break ${srcfile}:[gdb_get_line_number "euphonium"]" ".*" \
     "set breakpoint"
 
 # 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}
            {echo "odd "}
            {print i}
            {end}
            {set variable $foo = 0}
            {set variable $j = 0}
            {while $j < i}
            {set variable $foo += $j}
            {set variable $j++}
            {end}
            {print $foo}
            {if i != 40}
            {c}
            {end}
+           {end}
            {end}}
 
 send_gdb "commands\n"
 for {set i 0} {$i < [llength $lines]} {incr i} {
     gdb_expect {
         -re ".*>" {
             send_gdb "[lindex $lines $i]\n"
         }
         -re "$gdb_prompt $" {
             set reason "got top-level prompt early"
@@ skipping 13 matching lines @@
 
 gdb_run_cmd
 
 set prev_timeout $timeout
 set timeout 120
 
 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"
     }
     eof {
         kfail "gdb/1489" "run program with breakpoint commands (GDB died)"
     }
 }
 
 set timeout $prev_timeout