X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=gdb%2Ftestsuite%2Fgdb.cp%2Fannota2.exp;h=51cf92ae1a195d856d083a3d50f13f977f487863;hb=213516ef315dc1785e4990ef0fc011abedb38cc0;hp=26c8abf1682c9106b01af54c78642efd7ef36600;hpb=568d657528fe676571c95e51a2f64112782edfdb;p=thirdparty%2Fbinutils-gdb.git diff --git a/gdb/testsuite/gdb.cp/annota2.exp b/gdb/testsuite/gdb.cp/annota2.exp index 26c8abf1682..51cf92ae1a1 100644 --- a/gdb/testsuite/gdb.cp/annota2.exp +++ b/gdb/testsuite/gdb.cp/annota2.exp @@ -1,5 +1,4 @@ -# Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2007, 2008, 2009 -# Free Software Foundation, Inc. +# Copyright 1999-2023 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 @@ -16,46 +15,29 @@ # This file was written by Elena Zannoni (ezannoni@cygnus.com) -if $tracelevel then { - strace $tracelevel -} - # # test running programs # -set prms_id 0 -set bug_id 0 if { [skip_cplus_tests] } { continue } -set testfile "annota2" -set srcfile ${testfile}.cc -set binfile ${objdir}/${subdir}/${testfile} +standard_testfile .cc -if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug c++ nowarnings}] != "" } { - untested annota2.exp +if {[prepare_for_testing "failed to prepare" $testfile $srcfile \ + {debug c++ nowarnings}]} { return -1 } -# are we on a target board? If so, don't run these tests. -# note: this is necessary because we cannot use runto_main (which would -# work for remote targets too) because of the different prompt we get -# when using annotation level 2. +# This testcase cannot use runto_main because of the different prompt +# we get when using annotation level 2. # -if [is_remote target] then { +if ![target_can_use_run_cmd] { return 0 } - -gdb_exit -gdb_start -gdb_reinitialize_dir $srcdir/$subdir -gdb_load ${binfile} - -if [target_info exists gdb_stub] { - gdb_step_for_stub; -} +set breakpoints_invalid "\r\n\032\032breakpoints-invalid\r\n" +set frames_invalid "\r\n\032\032frames-invalid\r\n" # # line number where we need to stop in main @@ -64,8 +46,7 @@ set main_line 25 # The commands we test here produce many lines of output; disable "press # to continue" prompts. -send_gdb "set height 0\n" -gdb_expect -re "$gdb_prompt $" +gdb_test_no_output "set height 0" # # break at main @@ -92,12 +73,11 @@ gdb_expect { timeout { fail "annotation set at level 2 (timeout)" } } -send_gdb "run\n" - gdb_expect { - -re "$main_line.*$gdb_prompt$" { pass "run until main breakpoint" } - -re ".*$gdb_prompt$" { fail "run until main breakpoint" } - timeout { fail "run until main breakpoint (timeout)" } - } +gdb_test_multiple "run" "run until main breakpoint, first time" { + -re "$main_line.*$gdb_prompt$" { + pass $gdb_test_name + } +} # # print class 'a' with public fields. @@ -107,25 +87,65 @@ send_gdb "run\n" # annotate-field-value # annotate-field-end # -send_gdb "print a\n" -gdb_expect { - -re "\r\n\032\032post-prompt\r\n\r\n\032\032value-history-begin 1 -\r\n.*= \r\n\032\032value-history-value\r\n\\{\r\n\032\032field-begin -\r\nx\r\n\032\032field-name-end\r\n = \r\n\032\032field-value\r\n1\r\n\032\032field-end\r\n, \r\n\032\032field-begin -\r\ny\r\n\032\032field-name-end\r\n = \r\n\032\032field-value\r\n2\r\n\032\032field-end\r\n\\}\r\n\r\n\032\032value-history-end\r\n$gdb_prompt$" \ - { pass "print class" } - -re ".*$gdb_prompt$" { fail "print class" } - timeout { fail "print class (timeout)" } + +set pat [multi_line "" \ + "\032\032post-prompt" \ + "" \ + "\032\032value-history-begin 1 -" \ + ".*= " \ + "\032\032value-history-value" \ + "\\{" \ + "\032\032field-begin -" \ + "x" \ + "\032\032field-name-end" \ + " = " \ + "\032\032field-value" \ + "1" \ + "\032\032field-end" \ + ", " \ + "\032\032field-begin -" \ + "y" \ + "\032\032field-name-end" \ + " = " \ + "\032\032field-value" \ + "2" \ + "\032\032field-end" \ + "\\}" \ + "" \ + "\032\032value-history-end" \ + $gdb_prompt$] + +gdb_test_multiple "print a" "print class" { + -re "$pat" { + pass "print class" + } } # # continue until exit # this will test: # annotate-exited +# `a.x is 1' is asynchronous regarding to `frames-invalid'. # -send_gdb "continue\n" -gdb_expect { - -re "\r\n\032\032post-prompt\r\nContinuing.\r\n\r\n\032\032starting\(\r\n\r\n\032\032frames-invalid\)+\r\na.x is 1\r\n\r\n\032\032exited 0\r\n\r\nProgram exited normally.\r\n\r\n\032\032stopped\r\n$gdb_prompt$" \ - { pass "continue until exit" } - -re ".*$gdb_prompt$" { fail "continue to exit" } - timeout { fail "continue to exit (timeout)" } + +set pat [multi_line "" \ + "\032\032post-prompt" \ + "Continuing." \ + "" \ + "\032\032starting" \ + "\(${frames_invalid}\)*a.x is 1" \ + "\(${frames_invalid}\)*"\ + "\032\032exited 0" \ + "$inferior_exited_re normally." \ + "" \ + "\032\032thread-exited,id=\"1\",group-id=\"i1\"" \ + "" \ + "\032\032stopped" \ + $gdb_prompt$] +gdb_test_multiple "continue" "continue until exit" { + -re "$pat" { + pass "continue until exit" + } } # @@ -136,7 +156,7 @@ gdb_expect { -re ".*Delete all breakpoints. \\(y or n\\) \r\n\032\032query.*$" { send_gdb "y\n" gdb_expect { - -re "\r\n\032\032post-query\r\n$gdb_prompt$" { pass "delete bps" } + -re "\r\n\032\032post-query\r\n${breakpoints_invalid}$gdb_prompt$" { pass "delete bps" } -re ".*$gdb_prompt$" { fail "delete bps" } timeout { fail "delete bps (timeout)" } } @@ -148,12 +168,16 @@ gdb_expect { # # break at first line of main. # -send_gdb "break 22\n" -gdb_expect { - -re "\r\n\032\032post-prompt\r\n\r\n\032\032breakpoints-invalid\r\nBreakpoint.*at $hex: file.*$srcfile, line.*\r\n$gdb_prompt$" \ - { pass "breakpoint at main" } - -re ".*$gdb_prompt$" { fail "break at main" } - timeout { fail "break at main (timeout)" } +set pat [multi_line "" \ + "\032\032post-prompt" \ + "Breakpoint.*at $hex: file.*$srcfile, line.*" \ + "\032\032breakpoints-invalid.*" \ + $gdb_prompt$] + +gdb_test_multiple "break 22" "break at main" { + -re "$pat" { + pass "breakpoint at main" + } } # @@ -165,37 +189,70 @@ set main_line 22 # run program up to breakpoint. # - -send_gdb "run\n" - gdb_expect { - -re "$main_line.*$gdb_prompt$" { pass "run until main breakpoint" } - -re ".*$gdb_prompt$" { fail "run until main breakpoint" } - timeout { fail "run until main breakpoint (timeout)" } - } +gdb_test_multiple "run" "run until main breakpoint, second time" { + -re "$main_line.*$gdb_prompt$" { + pass $gdb_test_name + } +} # # set up a watch point on a.x # -send_gdb "watch a.x\n" -gdb_expect { - -re "\r\n\032\032post-prompt\r\n\r\n\032\032breakpoints-invalid\r\n.*atchpoint 3: a.x\r\n$gdb_prompt$" \ - { pass "set watch on a.x" } - -re ".*$gdb_prompt$" { fail "set watch on a.x" } - timeout { fail "set watch on a.x (timeout)" } +set pat [multi_line "" \ + "\032\032post-prompt" \ + ".*atchpoint 3: a.x" \ + "" \ + "\032\032breakpoints-invalid" \ + $gdb_prompt$] +gdb_test_multiple "watch a.x" "set watch on a.x" { + -re "$pat" { + pass "set watch on a.x" + } } # # do a next, so that the watchpoint triggers. This will test: # annotate-watchpoint # -send_gdb "next\n" -gdb_expect { - -re "\r\n\032\032post-prompt\r\n\r\n(\032\032breakpoints-invalid\r\n\r\n)*\032\032starting\r\n\r\n(\032\032frames-invalid\r\n\r\n)*\032\032watchpoint 3\r\n.*atchpoint 3: a.x\r\n\r\nOld value = 0\r\nNew value = 1\r\n\r\n\032\032frame-begin 0 $hex\r\n\r\n\032\032frame-function-name\r\nmain\r\n\032\032frame-args\r\n \\(\\)\r\n\032\032frame-source-begin\r\n at \r\n\032\032frame-source-file\r\n.*$srcfile\r\n\032\032frame-source-file-end\r\n:\r\n\032\032frame-source-line\r\n$decimal\r\n\032\032frame-source-end\r\n\r\n\r\n\032\032source .*$srcfile.*beg:$hex\r\n\r\n\032\032frame-end\r\n\r\n\032\032stopped\r\n.*$gdb_prompt$" \ - { pass "watch triggered on a.x" } - -re "\r\n\032\032post-prompt\r\n\r\n(\032\032breakpoints-invalid\r\n\r\n)*\032\032starting\r\n\r\n(\032\032frames-invalid\r\n\r\n)*\032\032source .*$srcfile.*beg:$hex\r\n\r\n\032\032frame-end\r\n\r\n\032\032stopped\r\n$gdb_prompt$" \ - { kfail "gdb/38" "watch triggered on a.x" } - -re ".*$gdb_prompt$" { fail "watch triggered on a.x" } - timeout { fail "watch triggered on a.x (timeout)" } +set pat [multi_line "" \ + "\032\032post-prompt" \ + "" \ + "\032\032starting" \ + "\(${frames_invalid}\)*${breakpoints_invalid}\(${frames_invalid}\)*" \ + "\032\032watchpoint 3" \ + ".*atchpoint 3: a.x" \ + "" \ + "Old value = 0" \ + "New value = 1" \ + "" \ + "\032\032frame-begin 0 $hex" \ + "" \ + "\032\032frame-function-name" \ + "main" \ + "\032\032frame-args" \ + " \\(\\)" \ + "\032\032frame-source-begin" \ + " at " \ + "\032\032frame-source-file" \ + ".*$srcfile" \ + "\032\032frame-source-file-end" \ + ":" \ + "\032\032frame-source-line" \ + "$decimal" \ + "\032\032frame-source-end" \ + "" \ + "" \ + "\032\032source .*$srcfile.*beg:$hex" \ + "" \ + "\032\032frame-end" \ + "" \ + "\032\032stopped" \ + $gdb_prompt$] + +gdb_test_multiple "next" "watch triggered on a.x" { + -re "$pat" { + pass "watch triggered on a.x" + } } @@ -205,12 +262,14 @@ gdb_expect { # test: # annotate-quit # -send_gdb "\003" -gdb_expect { - -re "\r\n\032\032error-begin\r\nQuit\r\n\r\n\032\032quit\r\n$gdb_prompt$" \ +if ![target_info exists gdb,nointerrupts] { + send_gdb "\003" + gdb_expect { + -re "\r\n\032\032error-begin\r\nQuit\r\n\r\n\032\032quit\r\n$gdb_prompt$" \ { pass "annotate-quit" } - -re ".*$gdb_prompt$" { fail "annotate-quit" } - timeout { fail "annotate-quit (timeout)" } + -re ".*$gdb_prompt$" { fail "annotate-quit" } + timeout { fail "annotate-quit (timeout)" } + } } #