X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Ftestsuite%2Fgdb.base%2Fcall-strs.exp;h=1163449ad50e70bdc99440026ecbf0d0d811dae7;hb=61f80d5dafebdb3a2cebac489803c5ce18827178;hp=20f358a3b63a02288908f01637349f20caad443a;hpb=1996fae84682e8ddd146215dd2959ad1ec924c09;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/testsuite/gdb.base/call-strs.exp b/gdb/testsuite/gdb.base/call-strs.exp index 20f358a3b6..1163449ad5 100644 --- a/gdb/testsuite/gdb.base/call-strs.exp +++ b/gdb/testsuite/gdb.base/call-strs.exp @@ -1,21 +1,17 @@ -# Copyright (C) 1998 Free Software Foundation, Inc. +# Copyright 1998-2019 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 2 of the License, or +# 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, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -# Please email any bugs, comments, and/or additions to this file to: -# bug-gdb@prep.ai.mit.edu +# along with this program. If not, see . # This file was written by Elena Zannoni (ezannoni@cygnus.com) @@ -26,217 +22,122 @@ #debug strarg -if $tracelevel then { - strace $tracelevel -} - -set prms_id 0 -set bug_id 0 - -set testfile "call-strs" -set srcfile ${testfile}.c -set binfile ${objdir}/${subdir}/${testfile} - -if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } { - gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail." -} - +standard_testfile -# The a29k can't call functions, so don't even bother with this test. +# Some targets can't call functions, so don't even bother with this +# test. if [target_info exists gdb,cannot_call_functions] { - setup_xfail "*-*-*" 2416 - fail "This target can not call functions" + unsupported "this target can not call functions" continue } -# Set the current language to C. This counts as a test. If it -# fails, then we skip the other tests. - -proc set_lang_c {} { - global gdb_prompt - - send_gdb "set language c\n" - gdb_expect { - -re ".*$gdb_prompt $" {} - timeout { fail "set language c (timeout)" ; return 0; } - } - - send_gdb "show language\n" - gdb_expect { - -re ".* source language is \"c\".*$gdb_prompt $" { - pass "set language to \"c\"" - return 1 - } - -re ".*$gdb_prompt $" { - fail "setting language to \"c\"" - return 0 - } - timeout { - fail "can't show language (timeout)" - return 0 - } - } -} - - -# Start with a fresh gdb. - -gdb_exit -gdb_start -gdb_reinitialize_dir $srcdir/$subdir -gdb_load ${binfile} -send_gdb "set print sevenbit-strings\n" ; gdb_expect -re "$gdb_prompt $" -send_gdb "set print address off\n" ; gdb_expect -re "$gdb_prompt $" -send_gdb "set width 0\n" ; gdb_expect -re "$gdb_prompt $" +if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { + return -1 +} +gdb_test_no_output "set print sevenbit-strings" +gdb_test_no_output "set print address off" +gdb_test_no_output "set print symbol off" +gdb_test_no_output "set width 0" if ![runto_main] then { perror "couldn't run to breakpoint" continue } -#step -send_gdb "step\n" -gdb_expect { - -re ".*strcpy\\(buf, \"test string\"\\);.*$gdb_prompt $" {pass "step after assignment to s"} - -re ".*$gdb_prompt $" { fail "step after assignment to s" } - timeout { fail "step after assignment to s (timeout)" } - } +set prev_timeout $timeout +set timeout 120 +gdb_test "next 2" \ + "strcpy\\(buf, \"test string\"\\);" \ + "step after assignment to s" -#step -send_gdb "step\n" -gdb_expect { - -re ".*str_func\\(\"abcd\", \"efgh\", \"ijkl\", \"mnop\", \"qrst\", \"uvwx\", \"yz12\"\\);.*$gdb_prompt $" {pass "step after strcpy"} - -re ".*$gdb_prompt $" { fail "step after strcpy" } - timeout { fail "step after strcpy (timeout)" } - } +#next +gdb_test "next" \ + "str_func\\(\"abcd\", \"efgh\", \"ijkl\", \"mnop\", \"qrst\", \"uvwx\", \"yz12\"\\);" \ + "next over strcpy" #print buf -send_gdb "print buf\n" -gdb_expect { - -re ".*\"test string\",.*repeats 88 times.*$gdb_prompt $" { - pass "print buf" - } - -re ".*$gdb_prompt $" { fail "print buf" } - timeout { fail "(timeout) print buf" } - } - +gdb_test "print buf" \ + "\"test string\",.*repeats 88 times.*" #print s -send_gdb "print s\n" -gdb_expect { - -re ".*= \"test string\".*$gdb_prompt $" { - pass "print s" - } - -re ".*$gdb_prompt $" { fail "print s" } - timeout { fail "(timeout) print sum_array_print(10, *list1, *list2, *list3, *list4)" } - } - +gdb_test "print s" \ + " = \"test string\".*" #print str_func1(s) -send_gdb "print str_func1(s)\n" -gdb_expect { - -re "first string arg is: test string.*\"test string\".*$gdb_prompt $" { - pass "print str_func1(s)" - } - -re ".*$gdb_prompt $" { fail "print str_func1(s)" } - timeout { fail "(timeout) print str_func1(s)" } - } - +if ![gdb_skip_stdio_test "print str_func1(s)"] { + gdb_test_stdio "print str_func1(s)" \ + "first string arg is: test string" \ + "\"test string\".*" +} #print str_func1("test string") -send_gdb "print str_func1(\"test string\")\n" -gdb_expect { - -re "first string arg is: test string.*\"test string\".*$gdb_prompt $" { - pass "print str_func1(\"test string\")" - } - -re ".*$gdb_prompt $" { fail "print str_func1(\"test string\")" } - timeout { fail "(timeout) print str_func1(\"test string\")" } - } +if ![gdb_skip_stdio_test "print str_func1(teststring)"] { + gdb_test_stdio "print str_func1(\"test string\")" \ + "first string arg is: test string" \ + "\"test string\".*" +} #call str_func1(s) -send_gdb "call str_func1(s)\n" -gdb_expect { - -re "first string arg is: test string.*\"test string\".*$gdb_prompt $" { - pass "call str_func1(s)" - } - -re ".*$gdb_prompt $" { fail "call str_func1(s)" } - timeout { fail "(timeout) call str_func1(s)" } - } +if ![gdb_skip_stdio_test "call str_func1(s)"] { + gdb_test_stdio "call str_func1(s)" \ + "first string arg is: test string" \ + "\"test string\".*" +} #call str_func1("test string") -send_gdb "call str_func1(\"test string\")\n" -gdb_expect { - -re "first string arg is: test string.*\"test string\".*$gdb_prompt $" { - pass "call str_func1(\"test string\")" - } - -re ".*$gdb_prompt $" { fail "call str_func1(\"test string\")" } - timeout { fail "(timeout) call str_func1(\"test string\")" } - } +if ![gdb_skip_stdio_test "call str_func1 (...)"] { + gdb_test_stdio "call str_func1(\"test string\")" \ + "first string arg is: test string" \ + "\"test string\".*" +} #print str_func1(buf) -send_gdb "print str_func1(buf)\n" -gdb_expect { - -re "first string arg is: test string.*\"test string\".*$gdb_prompt $" { - pass "print str_func1(buf)" - } - -re ".*$gdb_prompt $" { fail "print str_func1(buf)" } - timeout { fail "(timeout) print str_func1(buf)" } - } +if ![gdb_skip_stdio_test "print str_func1(buf)"] { + gdb_test_stdio "print str_func1(buf)" \ + "first string arg is: test string" \ + "\"test string\".*" +} #call str_func1(buf) -send_gdb "call str_func1(buf)\n" -gdb_expect { - -re "first string arg is: test string.*\"test string\".*$gdb_prompt $" { - pass "call str_func1(buf)" - } - -re ".*$gdb_prompt $" { fail "call str_func1(buf)" } - timeout { fail "(timeout) call str_func1(buf)" } - } +if ![gdb_skip_stdio_test "call str_func1(buf)"] { + gdb_test_stdio "call str_func1(buf)" \ + "first string arg is: test string" \ + "\"test string\".*" +} #print str_func("a","b","c","d","e","f","g") -send_gdb "print str_func(\"a\",\"b\",\"c\",\"d\",\"e\",\"f\",\"g\")\n" -gdb_expect { - -re "first string arg is: a\[ \t\r\n\]+second string arg is: b\[ \t\r\n\]+third string arg is: c\[ \t\r\n\]+fourth string arg is: d\[ \t\r\n\]+fifth string arg is: e\[ \t\r\n\]+sixth string arg is: f\[ \t\r\n\]+seventh string arg is: g\[ \t\r\n\]+.*= \"abcdefg\".*$gdb_prompt $" { - pass "print str_func(\"a\",\"b\",\"c\",\"d\",\"e\",\"f\",\"g\")" - } - -re ".*$gdb_prompt $" { fail "print str_func(\"a\",\"b\",\"c\",\"d\",\"e\",\"f\",\"g\")" } - timeout { fail "(timeout) print str_func(\"a\",\"b\",\"c\",\"d\",\"e\",\"f\",\"g\")" } - } +if ![gdb_skip_stdio_test "print str_func(a,b,c,d,e,f,g)"] { + gdb_test_stdio "print str_func(\"a\",\"b\",\"c\",\"d\",\"e\",\"f\",\"g\")" \ + "first string arg is: a\[ \t\r\n\]+second string arg is: b\[ \t\r\n\]+third string arg is: c\[ \t\r\n\]+fourth string arg is: d\[ \t\r\n\]+fifth string arg is: e\[ \t\r\n\]+sixth string arg is: f\[ \t\r\n\]+seventh string arg is: g\[ \t\r\n\]+" \ + "= \"abcdefg\".*" +} #call str_func("a","b","c","d","e","f","g") -send_gdb "call str_func(\"a\",\"b\",\"c\",\"d\",\"e\",\"f\",\"g\")\n" -gdb_expect { - -re "first string arg is: a\[ \t\r\n\]+second string arg is: b\[ \t\r\n\]+third string arg is: c\[ \t\r\n\]+fourth string arg is: d\[ \t\r\n\]+fifth string arg is: e\[ \t\r\n\]+sixth string arg is: f\[ \t\r\n\]+seventh string arg is: g\[ \t\r\n\]+.*= \"abcdefg\".*$gdb_prompt $" { - pass "call str_func(\"a\",\"b\",\"c\",\"d\",\"e\",\"f\",\"g\")" - } - -re ".*$gdb_prompt $" { fail "call str_func(\"a\",\"b\",\"c\",\"d\",\"e\",\"f\",\"g\")" } - timeout { fail "(timeout) call str_func(\"a\",\"b\",\"c\",\"d\",\"e\",\"f\",\"g\")" } - } - -#print str_func(s,s,s,s,s,s,s,s) -send_gdb "print str_func(s,s,s,s,s,s,s,s)\n" -gdb_expect { - -re "first string arg is: test string\[ \t\r\n\]+second string arg is: test string\[ \t\r\n\]+third string arg is: test string\[ \t\r\n\]+fourth string arg is: test string\[ \t\r\n\]+fifth string arg is: test string\[ \t\r\n\]+sixth string arg is: test string\[ \t\r\n\]+seventh string arg is: test string\[ \t\r\n\]+.*\"test stringtest stringtest stringtest stringtest stringtest stringtest string\".*$gdb_prompt $" { - pass "print str_func(s,s,s,s,s,s,s,s)" - } - -re ".*$gdb_prompt $" { fail "print str_func(s,s,s,s,s,s,s,s)" } - timeout { fail "(timeout) print str_func(s,s,s,s,s,s,s,s)" } - } - -#call str_func(s,s,s,s,s,s,s,s) -send_gdb "call str_func(s,s,s,s,s,s,s,s)\n" -gdb_expect { - -re "first string arg is: test string\[ \t\r\n\]+second string arg is: test string\[ \t\r\n\]+third string arg is: test string\[ \t\r\n\]+fourth string arg is: test string\[ \t\r\n\]+fifth string arg is: test string\[ \t\r\n\]+sixth string arg is: test string\[ \t\r\n\]+seventh string arg is: test string\[ \t\r\n\]+.*\"test stringtest stringtest stringtest stringtest stringtest stringtest string\".*$gdb_prompt $" { - pass "call str_func(s,s,s,s,s,s,s,s)" - } - -re ".*$gdb_prompt $" { fail "call str_func(s,s,s,s,s,s,s,s)" } - timeout { fail "(timeout) call str_func(s,s,s,s,s,s,s,s)" } - } +if ![gdb_skip_stdio_test "call str_func(a,b,c,d,e,f,g)"] { + gdb_test_stdio "call str_func(\"a\",\"b\",\"c\",\"d\",\"e\",\"f\",\"g\")" \ + "first string arg is: a\[ \t\r\n\]+second string arg is: b\[ \t\r\n\]+third string arg is: c\[ \t\r\n\]+fourth string arg is: d\[ \t\r\n\]+fifth string arg is: e\[ \t\r\n\]+sixth string arg is: f\[ \t\r\n\]+seventh string arg is: g\[ \t\r\n\]+" \ + "= \"abcdefg\".*" +} + +#print str_func(s,s,s,s,s,s,s) +if ![gdb_skip_stdio_test "print str_func(s,s,s,s,s,s,s,s)"] { + gdb_test_stdio "print str_func(s,s,s,s,s,s,s)" \ + "first string arg is: test string\[ \t\r\n\]+second string arg is: test string\[ \t\r\n\]+third string arg is: test string\[ \t\r\n\]+fourth string arg is: test string\[ \t\r\n\]+fifth string arg is: test string\[ \t\r\n\]+sixth string arg is: test string\[ \t\r\n\]+seventh string arg is: test string\[ \t\r\n\]+" \ + "\"test stringtest stringtest stringtest stringtest stringtest stringtest string\".*" +} + +#call str_func(s,s,s,s,s,s,s) +if ![gdb_skip_stdio_test "call str_func(s,s,s,s,s,s,s,s)"] { + gdb_test_stdio "call str_func(s,s,s,s,s,s,s)" \ + "first string arg is: test string\[ \t\r\n\]+second string arg is: test string\[ \t\r\n\]+third string arg is: test string\[ \t\r\n\]+fourth string arg is: test string\[ \t\r\n\]+fifth string arg is: test string\[ \t\r\n\]+sixth string arg is: test string\[ \t\r\n\]+seventh string arg is: test string\[ \t\r\n\]+" \ + "\"test stringtest stringtest stringtest stringtest stringtest stringtest string\".*" +} gdb_exit -return 0 -~ + +set timeout $prev_timeout +