Merge GDB 7.5.1

gdb/testsuite/gdb.base/list.exp

 # Copyright 1992, 1994-1999, 2002-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
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # This file was written by Fred Fish. (fnf@cygnus.com)
 
-if $tracelevel then {
-        strace $tracelevel
-}
-
 
 set testfile "list"
 set binfile ${objdir}/${subdir}/${testfile}
 
 # Need to download the header to the host.
 remote_download host ${srcdir}/${subdir}/list0.h list0.h
 
 
 if  { [gdb_compile "${srcdir}/${subdir}/list0.c" "${binfile}0.o" object {debug}] != "" } {
      untested list.exp
      return -1
 }
 
 if  { [gdb_compile "${srcdir}/${subdir}/list1.c" "${binfile}1.o" object {debug}] != "" } {
      untested list.exp
      return -1
 }
 
 if  { [gdb_compile "${binfile}0.o ${binfile}1.o" ${binfile} executable {debug}] != "" } {
      untested list.exp
      return -1
 }
 
 
 
 # Create and source the file that provides information about the compiler
 # used to compile the test case.
-if [get_compiler_info ${binfile}] {
+if [get_compiler_info] {
     return -1;
 }
 
 #
 # Local utility proc just to set and verify listsize
 # Return 1 if success, 0 if fail.
 #
 
 set set_listsize_count 0;
 
@@ skipping 13 matching lines @@
         return 0;
     }
     return 1
 }
 
 #
 # Test display of listsize lines around a given line number.
 #
 
 proc test_listsize {} {
-    global gdb_prompt use_gdb_stub
+    global gdb_prompt
     global hp_cc_compiler
     global hp_aCC_compiler
 
     # Show default size
 
     gdb_test "show listsize" "Number of source lines gdb will list by default is 10.*" "show default list size"
     
     # Show the default lines
-    # Note that remote targets that have debugging info for _start available will
-    # list the lines there instead of main, so we skip this test for remote targets.
-    # The second case is for optimized code, it is still correct.
-    
-    if $use_gdb_stub {
-        runto_main;
-        unsupported "list default lines around main";
-    } else {
-        gdb_test "list" "(1\[ \t\]+#include \"list0.h\".*10\[ \t\]+x = 0;|2.*11\[ \t\]+foo .x\[+)\]+;)" "list default lines around main"
-    }
+
+    gdb_test "list" "(1\[ \t\]+#include \"list0.h\".*7\[ \t\]+x = 0;\r\n.*10\[ \t\]+foo .x\[+)\]+;)" "list default lines around main"
 
     # Ensure we can limit printouts to one line
 
     if [set_listsize 1] {
         gdb_test "list 1" "1\[ \t\]+#include \"list0.h\"" "list line 1 with listsize 1"
         gdb_test "list 2" "2\[ \t\]+" "list line 2 with listsize 1"
     }    
 
     # Try just two lines
     
@@ skipping 59 matching lines @@
 # Test "list filename:number" for C source file
 #
 
 proc test_list_filename_and_number {} {
     global gdb_prompt
 
     set testcnt 0
 
     send_gdb "list list0.c:1\n"
     gdb_expect {
-        -re "1\[ \t\]+#include \"list0.h\".*10\[ \t]+x = 0;\r\n$gdb_prompt $" {
+        -re "1\[ \t\]+#include \"list0.h\".*10\[ \t\]+foo .x\[+)\]+;\r\n$gdb_prompt $" {
             incr testcnt 
         }
         -re ".*$gdb_prompt $" { fail "list list0.c:1" ; gdb_suppress_tests }
         timeout { fail "list list0.c:1 (timeout)" ; gdb_suppress_tests }
     }
     send_gdb "list list0.c:10\n"
     gdb_expect {
         -re "5\[ \t\]+int x;.*14\[ \t\]+foo .x\[+)\]+;\r\n$gdb_prompt $" {
             incr testcnt 
         }
@@ skipping 23 matching lines @@
 #
 # Test "list function" for C source file
 #
 
 proc test_list_function {} {
     global gdb_prompt
 
     # gcc appears to generate incorrect debugging information for code
     # in include files, which breaks this test.
     # SunPRO cc is the second case below, it's also correct.
-    gdb_test "list main" "(5\[ \t\]+int x;.*14\[ \t\]+foo \[(\]+.*\[)\]+;|1\[ \t\]+#include .*10\[ \t\]+x = 0;)" "list function in source file 1"
+    gdb_test "list main" "(5\[ \t\]+int x;.*8\[ \t\]+foo \[(\]+.*\[)\]+;|1\[ \t\]+#include .*7\[ \t\]+x = 0;)" "list function in source file 1"
 
     # Ultrix gdb takes the second case below; it's also correct.
     # SunPRO cc is the third case.
     gdb_test "list bar" "(4\[ \t\]+void.*\[ \t\]*long_line.*;.*bar.*9\[ \t\]*.*|1\[ \t\]+void.*8\[ \t\]+\}|1\[ \t\]+void.*7\[ \t\]*long_line ..;|7\[ \t\]+void.*14\[ \t\]+\})" "list function in source file 2"
 
     # Test "list function" for C include file
     # Ultrix gdb is the second case, still correct.
     # SunPRO cc is the third case.
     gdb_test "list foo" "(3\[ \t\]+.*12\[ \t\]+bar \[(\]+.*\[)\]+;|2\[ \t\]+including file.*11\[ \t\]+bar \[(\]+.*\[)\]+;|1\[ \t\]+/. An include file.*10\[ \t\]+bar \[(\]+.*\[)\]+;)" "list function in include file"
 }
@@ skipping 91 matching lines @@
 
     send_gdb "list -\n"
     gdb_expect {
         -re "18\[ \t\]+foo \[(\]+.*\[)\]+;.*27\[ \t\]+foo \[(\]+.*\[)\]+;\r\n$gdb_prompt $" { incr testcnt }
         -re ".*$gdb_prompt $" { fail "list 18-27" ; gdb_suppress_tests }
         timeout { fail "list 18-27 (timeout)" ; gdb_suppress_tests }
     }
 
     send_gdb "list -\n"
     gdb_expect {
-        -re "8\[ \t\]+breakpoint\[(\]\[)\];.*17\[ \t\]+foo \[(\]+.*\[)\]+;\r\n$gdb_prompt $" { incr testcnt }
+        -re "8\[ \t\]+foo \[(\]+.*\[)\]+;.*17\[ \t\]+foo \[(\]+.*\[)\]+;\r\n$gdb_prompt $" { incr testcnt }
         -re ".*$gdb_prompt $" { fail "list 8-17" ; gdb_suppress_tests }
         timeout { fail "list 8-17 (timeout)" ; gdb_suppress_tests }
     }
 
     send_gdb "list -\n"
     gdb_expect {
-        -re "1\[ \t\]+#include .*7\[ \t\]+set_debug_traps\[(\]\[)\]+;\r\n$gdb_prompt $" { incr testcnt }
+        -re "1\[ \t\]+#include .*7\[ \t\]+x = 0;\r\n$gdb_prompt $" { incr testcnt }
         -re ".*$gdb_prompt $" { fail "list 1-7" ; gdb_suppress_tests }
         timeout { fail "list 1-7 (timeout)" ; gdb_suppress_tests }
     }
 
     pass "$testcnt successive \"list -\" commands to page backwards"
     gdb_stop_suppressing_tests;
 }
 
 #
 # Test "list first,last"
@@ skipping 24 matching lines @@
 proc test_list_filename_and_function {} {
     global gdb_prompt
 
     set testcnt 0
 
     # gcc appears to generate incorrect debugging information for code
     # in include files, which breaks this test.
     # SunPRO cc is the second case below, it's also correct.
     send_gdb "list list0.c:main\n"
     gdb_expect {
-        -re "1\[ \t\]+#include .*10\[ \t\]+x = 0;\r\n$gdb_prompt $" {
+        -re "1\[ \t\]+#include .*10\[ \t\]+foo \[(\]+.*\[)\]+;\r\n$gdb_prompt $" {
             incr testcnt
         }
         -re "5\[ \t\]+int x;.*14\[ \t\]+foo \[(\]+.*\[)\]+;\r\n$gdb_prompt $" {
             pass "list function in source file 1"
         }
         -re ".*$gdb_prompt $" { fail "list list0.c:main" }
         timeout { fail "list list0.c:main (timeout)" }
     }
 
     # Not sure what the point of having this function be unused is.
@@ skipping 109 matching lines @@
         # Test that GDB won't crash if the line being searched is extremely long.
 
         set oldtimeout $timeout
         set timeout [expr "$timeout + 300"]
         verbose "Timeout is now $timeout seconds" 2
         gdb_test "search 1234" ".*1234.*" "search extremely long line (> 5000 chars)"
         set timeout $oldtimeout
         verbose "Timeout is now $timeout seconds" 2
 }
 
+proc test_only_end {} {
+    gdb_test_no_output "set listsize 2"
+    gdb_test "list 1" "list 1\r\n1\[ \t\]\[^\r\n\]*\r\n2\[ \t\]\[^\r\n\]*"
+    gdb_test "list ,5" "list ,5\r\n4\[ \t\]\[^\r\n\]*\r\n5\[ \t\]\[^\r\n\]*"
+}
+
 # Start with a fresh gdb.
 
 gdb_exit
 gdb_start
 gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-if [target_info exists gdb_stub] {
-    gdb_step_for_stub;
-}
+gdb_file_cmd ${binfile}
 
 gdb_test_no_output "set width 0"
 
 test_listsize
 get_debug_format
 if [ set_listsize 10 ] then {
     test_list_include_file
     test_list_filename_and_number
     test_list_function
     test_list_forward
     test_list_backwards
     test_repeat_list_command
     test_list_range
     test_list_filename_and_function
     test_forward_search
+    test_only_end
 }
 
 remote_exec build "rm -f list0.h"