From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 29324 invoked by alias); 7 Dec 2003 21:21:31 -0000 Mailing-List: contact gdb-patches-help@sources.redhat.com; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sources.redhat.com Received: (qmail 29180 invoked from network); 7 Dec 2003 21:21:27 -0000 Received: from unknown (HELO fred.ninemoons.com) (68.14.214.217) by sources.redhat.com with SMTP; 7 Dec 2003 21:21:27 -0000 Received: from fred.ninemoons.com (fred.ninemoons.com [127.0.0.1]) by fred.ninemoons.com (8.12.8/8.12.8) with ESMTP id hB7LLIB8007683; Sun, 7 Dec 2003 14:21:18 -0700 Received: from localhost (localhost [[UNIX: localhost]]) by fred.ninemoons.com (8.12.8/8.12.8/Submit) id hB7LLH7q007681; Sun, 7 Dec 2003 14:21:17 -0700 From: Fred Fish Reply-To: fnf@ninemoons.com To: Andrew Cagney Subject: Re: [PATCH] Outwit compiler dead code elimination in break.exp test (revised patch) Date: Sun, 07 Dec 2003 21:21:00 -0000 User-Agent: KMail/1.5 Cc: gdb-patches@sources.redhat.com References: <200311292305.hATN51Uj013311@fred.ninemoons.com> <3FCB7FF9.4090601@gnu.org> In-Reply-To: <3FCB7FF9.4090601@gnu.org> MIME-Version: 1.0 Content-Type: Multipart/Mixed; boundary="Boundary-00=_Nn50/Bj96I3hKo+" Message-Id: <200312071421.17200.fnf@ninemoons.com> X-SW-Source: 2003-12/txt/msg00248.txt.bz2 --Boundary-00=_Nn50/Bj96I3hKo+ Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline Content-length: 469 On Monday 01 December 2003 10:52, Andrew Cagney wrote: > As for stopping GCC from eliminating code - last time this came up (ref > store.exp) it was recommended that the .c files be split so that GCC > couldn't see the potential optimization. OK. I've revised the patch to split the source file. This is pretty ugly though as there are a half dozen tests that have to be modified to accomodate two source files. I've attached the patch for review/approval. -Fred --Boundary-00=_Nn50/Bj96I3hKo+ Content-Type: text/x-diff; charset="iso-8859-1"; name="d" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="d" Content-length: 54758 ? diff1 ? diff2 ? diff3 ? diff4 ? diff5 ? gdb.base/break1.c ? gdb.base/d ? gdb.base/d2 Index: ChangeLog =================================================================== RCS file: /cvs/src/src/gdb/testsuite/ChangeLog,v retrieving revision 1.684 diff -c -p -r1.684 ChangeLog *** ChangeLog 6 Dec 2003 22:49:01 -0000 1.684 --- ChangeLog 7 Dec 2003 21:14:45 -0000 *************** *** 1,3 **** --- 1,30 ---- + 2003-12-07 Fred Fish + + * gdb.base/break.c (marker1, marker2, marker3, marker4): Move + functions to break1.c and leave prototypes behind. Add more + "set breakpoint NN here" comments. + * gdb.base/break1.c: New file. + + * gdb.base/break.exp: Handle compiling test case from multiple + source files and change source file references as needed. + * gdb.base/completion.exp: Ditto. + * gdb.base/condbreak.exp: Ditto. + * gdb.base/define.exp: Ditto. + * gdb.base/ena-dis-br.exp: Ditto. + * gdb.base/info-proc.exp: Ditto. + * gdb.base/maint.exp: Ditto. + * gdb.base/until.exp: Ditto. + + * gdb.base/condbreak.exp: Use bp_locationNN variables instead of + hardcoded line numbers. + * gdb.base/define.exp: Ditto. + * gdb.base/ena-dis-br.exp: Ditto. + * gdb.base/maint.exp: Ditto. + * gdb.base/until.exp: Ditto. + + * gdb.base/completion.exp: Use "break1" for completion tests since + "break" is no longer a unique prefix. + 2003-12-06 Andrew Cagney * gdb.base/structs.exp (test_struct_returns): When applicable, set Index: gdb.base/break.c =================================================================== RCS file: /cvs/src/src/gdb/testsuite/gdb.base/break.c,v retrieving revision 1.3 diff -c -p -r1.3 break.c *** gdb.base/break.c 13 Nov 2003 15:34:39 -0000 1.3 --- gdb.base/break.c 7 Dec 2003 21:14:45 -0000 *************** char *arg; *** 32,54 **** # include #endif /* ! vxworks */ - /* - * The following functions do nothing useful. They are included simply - * as places to try setting breakpoints at. They are explicitly - * "one-line functions" to verify that this case works (some versions - * of gcc have or have had problems with this). - */ - #ifdef PROTOTYPES ! int marker1 (void) { return (0); } ! int marker2 (int a) { return (1); } /* set breakpoint 8 here */ ! void marker3 (char *a, char *b) {} ! void marker4 (long d) {} /* set breakpoint 14 here */ #else ! int marker1 () { return (0); } ! int marker2 (a) int a; { return (1); } /* set breakpoint 9 here */ ! void marker3 (a, b) char *a, *b; {} ! void marker4 (d) long d; {} /* set breakpoint 13 here */ #endif /* --- 32,47 ---- # include #endif /* ! vxworks */ #ifdef PROTOTYPES ! extern int marker1 (void); ! extern int marker2 (int a); ! extern void marker3 (char *a, char *b); ! extern void marker4 (long d); #else ! extern int marker1 (); ! extern int marker2 (); ! extern void marker3 (); ! extern void marker4 (); #endif /* *************** char *argv[], **envp; *** 79,86 **** printf ("%d\n", factorial (atoi ("6"))); /* set breakpoint 1 here */ /* set breakpoint 12 here */ marker1 (); /* set breakpoint 11 here */ ! marker2 (43); ! marker3 ("stack", "trace"); marker4 (177601976L); argc = (argc == 12345); /* This is silly, but we can step off of it */ /* set breakpoint 2 here */ return argc; /* set breakpoint 10 here */ --- 72,79 ---- printf ("%d\n", factorial (atoi ("6"))); /* set breakpoint 1 here */ /* set breakpoint 12 here */ marker1 (); /* set breakpoint 11 here */ ! marker2 (43); /* set breakpoint 20 here */ ! marker3 ("stack", "trace"); /* set breakpoint 21 here */ marker4 (177601976L); argc = (argc == 12345); /* This is silly, but we can step off of it */ /* set breakpoint 2 here */ return argc; /* set breakpoint 10 here */ *************** int value; *** 96,102 **** if (value > 1) { /* set breakpoint 7 here */ value *= factorial (value - 1); } ! return (value); } #ifdef PROTOTYPES --- 89,95 ---- if (value > 1) { /* set breakpoint 7 here */ value *= factorial (value - 1); } ! return (value); /* set breakpoint 19 here */ } #ifdef PROTOTYPES Index: gdb.base/break1.c =================================================================== *** /dev/null 2003-01-30 03:24:37.000000000 -0700 --- gdb.base/break1.c 2003-12-07 13:19:17.000000000 -0700 *************** *** 0 **** --- 1,23 ---- + /* + * The following functions do nothing useful. They are included simply + * as places to try setting breakpoints at. They are explicitly + * "one-line functions" to verify that this case works (some versions + * of gcc have or have had problems with this). + * + * Some of the tests that use this file compile it with optimization on, + * which can result in these functions being optimized away. So it is + * compiled into a a separate object file. + */ + + #ifdef PROTOTYPES + int marker1 (void) { return (0); } /* set breakpoint 15 here */ + int marker2 (int a) { return (1); } /* set breakpoint 8 here */ + void marker3 (char *a, char *b) {} /* set breakpoint 17 here */ + void marker4 (long d) {} /* set breakpoint 14 here */ + #else + int marker1 () { return (0); } /* set breakpoint 16 here */ + int marker2 (a) int a; { return (1); } /* set breakpoint 9 here */ + void marker3 (a, b) char *a, *b; {} /* set breakpoint 18 here */ + void marker4 (d) long d; {} /* set breakpoint 13 here */ + #endif + Index: gdb.base/break.exp =================================================================== RCS file: /cvs/src/src/gdb/testsuite/gdb.base/break.exp,v retrieving revision 1.18 diff -c -p -r1.18 break.exp *** gdb.base/break.exp 13 Nov 2003 15:34:39 -0000 1.18 --- gdb.base/break.exp 7 Dec 2003 21:14:46 -0000 *************** set bug_id 0 *** 34,43 **** set testfile "break" set srcfile ${testfile}.c set binfile ${objdir}/${subdir}/${testfile} ! if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-w}] != "" } { ! gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail." } if [get_compiler_info ${binfile}] { --- 34,52 ---- set testfile "break" set srcfile ${testfile}.c + set srcfile1 ${testfile}1.c set binfile ${objdir}/${subdir}/${testfile} ! if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}0.o" object {debug additional_flags=-w}] != "" } { ! gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail." ! } ! ! if { [gdb_compile "${srcdir}/${subdir}/${srcfile1}" "${binfile}1.o" object {debug additional_flags=-w}] != "" } { ! gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail." ! } ! ! if { [gdb_compile "${binfile}0.o ${binfile}1.o" "${binfile}" executable {debug additional_flags=-w}] != "" } { ! gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail." } if [get_compiler_info ${binfile}] { *************** gdb_test "break main" \ *** 87,93 **** # test break at quoted function # gdb_test "break \"marker2\"" \ ! "Breakpoint.*at.* file .*$srcfile, line.*" \ "breakpoint quoted function" # --- 96,102 ---- # test break at quoted function # gdb_test "break \"marker2\"" \ ! "Breakpoint.*at.* file .*$srcfile1, line.*" \ "breakpoint quoted function" # *************** if {$hp_aCC_compiler} { *** 165,177 **** } set bp_location7 [gdb_get_line_number "set breakpoint 7 here"] ! set bp_location8 [gdb_get_line_number "set breakpoint 8 here"] ! set bp_location9 [gdb_get_line_number "set breakpoint 9 here"] gdb_test "info break" \ "Num Type\[ \]+Disp Enb Address\[ \]+What.* \[0-9\]+\[\t \]+breakpoint keep y.* in main at .*$srcfile:$main_line.* ! \[0-9\]+\[\t \]+breakpoint keep y.* in marker2 at .*$srcfile:($bp_location8|$bp_location9).* \[0-9\]+\[\t \]+breakpoint keep y.* in factorial$proto at .*$srcfile:$bp_location7.* \[0-9\]+\[\t \]+breakpoint keep y.* in main at .*$srcfile:$bp_location1.* \[0-9\]+\[\t \]+breakpoint keep y.* in main at .*$srcfile:$bp_location1.* --- 174,186 ---- } set bp_location7 [gdb_get_line_number "set breakpoint 7 here"] ! set bp_location8 [gdb_get_line_number "set breakpoint 8 here" $srcfile1] ! set bp_location9 [gdb_get_line_number "set breakpoint 9 here" $srcfile1] gdb_test "info break" \ "Num Type\[ \]+Disp Enb Address\[ \]+What.* \[0-9\]+\[\t \]+breakpoint keep y.* in main at .*$srcfile:$main_line.* ! \[0-9\]+\[\t \]+breakpoint keep y.* in marker2 at .*$srcfile1:($bp_location8|$bp_location9).* \[0-9\]+\[\t \]+breakpoint keep y.* in factorial$proto at .*$srcfile:$bp_location7.* \[0-9\]+\[\t \]+breakpoint keep y.* in main at .*$srcfile:$bp_location1.* \[0-9\]+\[\t \]+breakpoint keep y.* in main at .*$srcfile:$bp_location1.* *************** for {set i 6} {$i >= 1} {incr i -1} { *** 232,238 **** # # Run until the breakpoint set at a quoted function # ! gdb_test continue "Continuing\\..*Breakpoint \[0-9\]+, (0x\[0-9a-f\]+ in )?marker2 \\(a=43\\) at .*$srcfile:($bp_location8|$bp_location9).*" \ "run until quoted breakpoint" # # run until the file:function breakpoint at a line number in a file --- 241,247 ---- # # Run until the breakpoint set at a quoted function # ! gdb_test continue "Continuing\\..*Breakpoint \[0-9\]+, (0x\[0-9a-f\]+ in )?marker2 \\(a=43\\) at .*$srcfile1:($bp_location8|$bp_location9).*" \ "run until quoted breakpoint" # # run until the file:function breakpoint at a line number in a file *************** gdb_expect { *** 393,399 **** # Run to the desired default location. If not positioned here, the # tests below don't work. # ! gdb_test "until $bp_location1" "main .* at .*:$bp_location1.*" "until $bp_location1" # Verify that GDB allows one to just say "break", which is treated --- 402,408 ---- # Run to the desired default location. If not positioned here, the # tests below don't work. # ! gdb_test "until $bp_location1" "main .* at .*:$bp_location1.*" "until bp_location1" # Verify that GDB allows one to just say "break", which is treated *************** if ![runto_main] then { fail "break test *** 445,454 **** send_gdb "break $bp_location1\n" gdb_expect { -re "Breakpoint (\[0-9\]*) at .*, line $bp_location1.*$gdb_prompt $"\ ! {pass "set to-be-silent break $bp_location1"} -re "$gdb_prompt $"\ ! {fail "set to-be-silent break $bp_location1"} ! timeout {fail "(timeout) set to-be-silent break $bp_location1"} } send_gdb "commands $expect_out(1,string)\n" --- 454,463 ---- send_gdb "break $bp_location1\n" gdb_expect { -re "Breakpoint (\[0-9\]*) at .*, line $bp_location1.*$gdb_prompt $"\ ! {pass "set to-be-silent break bp_location1"} -re "$gdb_prompt $"\ ! {fail "set to-be-silent break bp_location1"} ! timeout {fail "(timeout) set to-be-silent break bp_location1"} } send_gdb "commands $expect_out(1,string)\n" *************** send_gdb "silent\n" *** 456,488 **** send_gdb "end\n" gdb_expect { -re ".*$gdb_prompt $"\ ! {pass "set silent break $bp_location1"} ! timeout {fail "(timeout) set silent break $bp_location1"} } send_gdb "info break $expect_out(1,string)\n" gdb_expect { -re "\[0-9\]*\[ \t\]*breakpoint.*:$bp_location1\r\n\[ \t\]*silent.*$gdb_prompt $"\ ! {pass "info silent break $bp_location1"} -re "$gdb_prompt $"\ ! {fail "info silent break $bp_location1"} ! timeout {fail "(timeout) info silent break $bp_location1"} } send_gdb "continue\n" gdb_expect { -re "Continuing.\r\n$gdb_prompt $"\ ! {pass "hit silent break $bp_location1"} -re "$gdb_prompt $"\ ! {fail "hit silent break $bp_location1"} ! timeout {fail "(timeout) hit silent break $bp_location1"} } send_gdb "bt\n" gdb_expect { -re "#0 main .* at .*:$bp_location1.*$gdb_prompt $"\ ! {pass "stopped for silent break $bp_location1"} -re "$gdb_prompt $"\ ! {fail "stopped for silent break $bp_location1"} ! timeout {fail "(timeout) stopped for silent break $bp_location1"} } # Verify that GDB can at least parse a breakpoint with the --- 465,497 ---- send_gdb "end\n" gdb_expect { -re ".*$gdb_prompt $"\ ! {pass "set silent break bp_location1"} ! timeout {fail "(timeout) set silent break bp_location1"} } send_gdb "info break $expect_out(1,string)\n" gdb_expect { -re "\[0-9\]*\[ \t\]*breakpoint.*:$bp_location1\r\n\[ \t\]*silent.*$gdb_prompt $"\ ! {pass "info silent break bp_location1"} -re "$gdb_prompt $"\ ! {fail "info silent break bp_location1"} ! timeout {fail "(timeout) info silent break bp_location1"} } send_gdb "continue\n" gdb_expect { -re "Continuing.\r\n$gdb_prompt $"\ ! {pass "hit silent break bp_location1"} -re "$gdb_prompt $"\ ! {fail "hit silent break bp_location1"} ! timeout {fail "(timeout) hit silent break bp_location1"} } send_gdb "bt\n" gdb_expect { -re "#0 main .* at .*:$bp_location1.*$gdb_prompt $"\ ! {pass "stopped for silent break bp_location1"} -re "$gdb_prompt $"\ ! {fail "stopped for silent break bp_location1"} ! timeout {fail "(timeout) stopped for silent break bp_location1"} } # Verify that GDB can at least parse a breakpoint with the *************** gdb_test "clear marker3" {Deleted breakp *** 561,568 **** send_gdb "set \$foo=$bp_location11\n" gdb_expect { -re "$gdb_prompt $"\ ! {pass "set convenience variable \$foo to $bp_location11"} ! timeout {fail "(timeout) set convenience variable \$foo to $bp_location11"} } send_gdb "break \$foo\n" gdb_expect { --- 570,577 ---- send_gdb "set \$foo=$bp_location11\n" gdb_expect { -re "$gdb_prompt $"\ ! {pass "set convenience variable \$foo to bp_location11"} ! timeout {fail "(timeout) set convenience variable \$foo to bp_location11"} } send_gdb "break \$foo\n" gdb_expect { *************** test_next_with_recursion *** 849,856 **** set binfileo2 ${objdir}/${subdir}/${testfile}o2 ! if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfileo2}" executable {debug additional_flags="-O2" }] != "" } { ! gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail." } if [get_compiler_info ${binfileo2}] { --- 858,873 ---- set binfileo2 ${objdir}/${subdir}/${testfile}o2 ! if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}O0.o" object {debug "additional_flags=-w -O2"}] != "" } { ! gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail." ! } ! ! if { [gdb_compile "${srcdir}/${subdir}/${srcfile1}" "${binfile}O1.o" object {debug "additional_flags=-w -O2"}] != "" } { ! gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail." ! } ! ! if { [gdb_compile "${binfile}O0.o ${binfile}O1.o" "${binfileo2}" executable {debug additional_flags=-w}] != "" } { ! gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail." } if [get_compiler_info ${binfileo2}] { *************** gdb_test "break main" \ *** 877,883 **** # test break at function # gdb_test "break marker4" \ ! "Breakpoint.*at.* file .*$srcfile, line.*" \ "breakpoint small function, optimized file" # --- 894,900 ---- # test break at function # gdb_test "break marker4" \ ! "Breakpoint.*at.* file .*$srcfile1, line.*" \ "breakpoint small function, optimized file" # *************** if ![target_info exists use_gdb_stub] { *** 922,940 **** # has no exactly matching line symbol, and GDB reports the breakpoint # as if it were in the middle of a line rather than at the beginning. ! set bp_location13 [gdb_get_line_number "set breakpoint 13 here"] ! set bp_location14 [gdb_get_line_number "set breakpoint 14 here"] send_gdb "continue\n" gdb_expect { ! -re "Breakpoint $decimal, marker4 \\(d=177601976\\) at .*$srcfile:$bp_location13\[\r\n\]+$bp_location13\[\t \]+void marker4.*" { pass "run until breakpoint set at small function, optimized file" } ! -re "Breakpoint $decimal, $hex in marker4 \\(d=177601976\\) at .*$srcfile:$bp_location13\[\r\n\]+$bp_location13\[\t \]+void marker4.*" { pass "run until breakpoint set at small function, optimized file" } ! -re "Breakpoint $decimal, marker4 \\(d=177601976\\) at .*$srcfile:$bp_location14\[\r\n\]+$bp_location14\[\t \]+void marker4.*" { # marker4() is defined at line 46 when compiled with -DPROTOTYPES ! pass "run until breakpoint set at small function, optimized file (line $bp_location14)" } -re ".*$gdb_prompt " { fail "run until breakpoint set at small function, optimized file" --- 939,957 ---- # has no exactly matching line symbol, and GDB reports the breakpoint # as if it were in the middle of a line rather than at the beginning. ! set bp_location13 [gdb_get_line_number "set breakpoint 13 here" $srcfile1] ! set bp_location14 [gdb_get_line_number "set breakpoint 14 here" $srcfile1] send_gdb "continue\n" gdb_expect { ! -re "Breakpoint $decimal, marker4 \\(d=177601976\\) at .*$srcfile1:$bp_location13\[\r\n\]+$bp_location13\[\t \]+void marker4.*" { pass "run until breakpoint set at small function, optimized file" } ! -re "Breakpoint $decimal, $hex in marker4 \\(d=177601976\\) at .*$srcfile1:$bp_location13\[\r\n\]+$bp_location13\[\t \]+void marker4.*" { pass "run until breakpoint set at small function, optimized file" } ! -re "Breakpoint $decimal, marker4 \\(d=177601976\\) at .*$srcfile1:$bp_location14\[\r\n\]+$bp_location14\[\t \]+void marker4.*" { # marker4() is defined at line 46 when compiled with -DPROTOTYPES ! pass "run until breakpoint set at small function, optimized file (line bp_location14)" } -re ".*$gdb_prompt " { fail "run until breakpoint set at small function, optimized file" Index: gdb.base/completion.exp =================================================================== RCS file: /cvs/src/src/gdb/testsuite/gdb.base/completion.exp,v retrieving revision 1.18 diff -c -p -r1.18 completion.exp *** gdb.base/completion.exp 7 Aug 2003 17:58:44 -0000 1.18 --- gdb.base/completion.exp 7 Dec 2003 21:14:47 -0000 *************** *** 38,45 **** # "info ajksdlfk " no completions # "info" " " # "info " ambiguous (all info commands) ! # "p \"break" unambiguous (completes to filename "break.c") ! # "p \"break." unambiguous (should complete to "break.c" but does not, # due to readline limitations) # "p 'a" ambiguous (all symbols starting with a) # "p b-a" ambiguous (all symbols starting with a) --- 38,45 ---- # "info ajksdlfk " no completions # "info" " " # "info " ambiguous (all info commands) ! # "p \"break1" unambiguous (completes to filename "break1.c") ! # "p \"break1." unambiguous (should complete to "break1.c" but does not, # due to readline limitations) # "p 'a" ambiguous (all symbols starting with a) # "p b-a" ambiguous (all symbols starting with a) *************** set bug_id 0 *** 64,72 **** set testfile "break" set srcfile ${testfile}.c set binfile ${objdir}/${subdir}/${testfile} ! if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-w}] != "" } { ! gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail." } if [get_compiler_info ${binfile}] { --- 64,82 ---- set testfile "break" set srcfile ${testfile}.c + set srcfile1 ${testfile}1.c set binfile ${objdir}/${subdir}/${testfile} ! ! if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}0.o" object {debug additional_flags=-w}] != "" } { ! gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail." ! } ! ! if { [gdb_compile "${srcdir}/${subdir}/${srcfile1}" "${binfile}1.o" object {debug additional_flags=-w}] != "" } { ! gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail." ! } ! ! if { [gdb_compile "${binfile}0.o ${binfile}1.o" "${binfile}" executable {debug additional_flags=-w}] != "" } { ! gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail." } if [get_compiler_info ${binfile}] { *************** gdb_expect { *** 351,411 **** } ! send_gdb "p \"break\t" sleep 1 gdb_expect { ! -re "^p \"break\\\x07$"\ { send_gdb "\n" gdb_expect { ! -re ".*$gdb_prompt $" { fail "complete 'p \"break'"} ! timeout {fail "(timeout) complete 'p \"break'"} } } ! -re "^p \"break\\.c\"$"\ { send_gdb "\n" gdb_expect { ! -re ".*$gdb_prompt $" { pass "complete 'p \"break'"} ! timeout {fail "(timeout) complete 'p \"break'"} } } ! -re "^p \"break.*$" { send_gdb "\n" gdb_expect { ! -re ".*$gdb_prompt $" { fail "complete 'p \"break'"} ! timeout {fail "(timeout) complete 'p \"break'"} } } ! -re ".*$gdb_prompt $" { fail "complete 'p \"break'" } ! timeout { fail "(timeout) complete 'p \"break'" } } setup_xfail "*-*-*" ! send_gdb "p \"break.\t" sleep 1 gdb_expect { ! -re "^p \"break\\.\\\x07$"\ { send_gdb "\n" gdb_expect { ! -re ".*$gdb_prompt $" { fail "complete 'p \"break.'"} ! timeout {fail "(timeout) complete 'p \"break.'"} } } ! -re "^p \"break\\.c\"$"\ { send_gdb "\n" gdb_expect { ! -re ".*$gdb_prompt $" { pass "complete 'p \"break.'"} ! timeout {fail "(timeout) complete 'p \"break.'"} } } ! -re "^p \"break\\..*$" { send_gdb "\n" gdb_expect { ! -re ".*$gdb_prompt $" { fail "complete 'p \"break.'"} ! timeout {fail "(timeout) complete 'p \"break.'"} } } ! -re ".*$gdb_prompt $" { fail "complete 'p \"break.'" } ! timeout { fail "(timeout) complete 'p \"break.'" } } send_gdb "p 'a\t" --- 361,421 ---- } ! send_gdb "p \"break1\t" sleep 1 gdb_expect { ! -re "^p \"break1\\\x07$"\ { send_gdb "\n" gdb_expect { ! -re ".*$gdb_prompt $" { fail "complete 'p \"break1'"} ! timeout {fail "(timeout) complete 'p \"break1'"} } } ! -re "^p \"break1\\.c\"$"\ { send_gdb "\n" gdb_expect { ! -re ".*$gdb_prompt $" { pass "complete 'p \"break1'"} ! timeout {fail "(timeout) complete 'p \"break1'"} } } ! -re "^p \"break1.*$" { send_gdb "\n" gdb_expect { ! -re ".*$gdb_prompt $" { fail "complete 'p \"break1'"} ! timeout {fail "(timeout) complete 'p \"break1'"} } } ! -re ".*$gdb_prompt $" { fail "complete 'p \"break1'" } ! timeout { fail "(timeout) complete 'p \"break1'" } } setup_xfail "*-*-*" ! send_gdb "p \"break1.\t" sleep 1 gdb_expect { ! -re "^p \"break1\\.\\\x07$"\ { send_gdb "\n" gdb_expect { ! -re ".*$gdb_prompt $" { fail "complete 'p \"break1.'"} ! timeout {fail "(timeout) complete 'p \"break1.'"} } } ! -re "^p \"break1\\.c\"$"\ { send_gdb "\n" gdb_expect { ! -re ".*$gdb_prompt $" { pass "complete 'p \"break1.'"} ! timeout {fail "(timeout) complete 'p \"break1.'"} } } ! -re "^p \"break1\\..*$" { send_gdb "\n" gdb_expect { ! -re ".*$gdb_prompt $" { fail "complete 'p \"break1.'"} ! timeout {fail "(timeout) complete 'p \"break1.'"} } } ! -re ".*$gdb_prompt $" { fail "complete 'p \"break1.'" } ! timeout { fail "(timeout) complete 'p \"break1.'" } } send_gdb "p 'a\t" *************** gdb_expect { *** 682,688 **** -re "marker1.*$gdb_prompt info func marker$"\ { send_gdb "\n" gdb_expect { ! -re "All functions matching regular expression \"marker\":.*File.*break.c:\r\nint marker1\\((void|)\\);\r\nint marker2\\(int\\).*marker3\\(char.*char.*\\).*marker4\\(long int\\);.*$gdb_prompt $"\ { pass "complete 'info func marke'"} -re ".*$gdb_prompt $" { fail "complete 'info func marke'"} timeout {fail "(timeout) complete 'info func marke'"} --- 692,698 ---- -re "marker1.*$gdb_prompt info func marker$"\ { send_gdb "\n" gdb_expect { ! -re "All functions matching regular expression \"marker\":.*File.*break1.c:\r\nint marker1\\((void|)\\);\r\nint marker2\\(int\\).*marker3\\(char.*char.*\\).*marker4\\(long int\\);.*$gdb_prompt $"\ { pass "complete 'info func marke'"} -re ".*$gdb_prompt $" { fail "complete 'info func marke'"} timeout {fail "(timeout) complete 'info func marke'"} Index: gdb.base/condbreak.exp =================================================================== RCS file: /cvs/src/src/gdb/testsuite/gdb.base/condbreak.exp,v retrieving revision 1.3 diff -c -p -r1.3 condbreak.exp *** gdb.base/condbreak.exp 23 May 2001 19:04:13 -0000 1.3 --- gdb.base/condbreak.exp 7 Dec 2003 21:14:47 -0000 *************** set bug_id 0 *** 35,44 **** set testfile "break" set srcfile ${testfile}.c set binfile ${objdir}/${subdir}/${testfile} ! if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-w}] != "" } { ! gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail." } if [get_compiler_info ${binfile}] { --- 35,53 ---- set testfile "break" set srcfile ${testfile}.c + set srcfile1 ${testfile}1.c set binfile ${objdir}/${subdir}/${testfile} ! if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}0.o" object {debug additional_flags=-w}] != "" } { ! gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail." ! } ! ! if { [gdb_compile "${srcdir}/${subdir}/${srcfile1}" "${binfile}1.o" object {debug additional_flags=-w}] != "" } { ! gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail." ! } ! ! if { [gdb_compile "${binfile}0.o ${binfile}1.o" "${binfile}" executable {debug additional_flags=-w}] != "" } { ! gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail." } if [get_compiler_info ${binfile}] { *************** if [target_info exists gdb_stub] { *** 55,60 **** --- 64,76 ---- gdb_step_for_stub; } + set bp_location1 [gdb_get_line_number "set breakpoint 1 here"] + set bp_location6 [gdb_get_line_number "set breakpoint 6 here"] + set bp_location8 [gdb_get_line_number "set breakpoint 8 here" $srcfile1] + set bp_location9 [gdb_get_line_number "set breakpoint 9 here" $srcfile1] + set bp_location15 [gdb_get_line_number "set breakpoint 15 here" $srcfile1] + set bp_location16 [gdb_get_line_number "set breakpoint 16 here" $srcfile1] + # # test break at function # *************** gdb_test "break main" \ *** 66,80 **** # test conditional break at function # gdb_test "break marker1 if 1==1" \ ! "Breakpoint.*at.* file .*$srcfile, line.*" gdb_test "delete 2" "" # # test conditional break at line number # ! gdb_test "break 79 if 1==1" \ ! "Breakpoint.*at.* file .*$srcfile, line 79\\." gdb_test "delete 3" "" --- 82,96 ---- # test conditional break at function # gdb_test "break marker1 if 1==1" \ ! "Breakpoint.*at.* file .*$srcfile1, line.*" gdb_test "delete 2" "" # # test conditional break at line number # ! gdb_test "break $srcfile:$bp_location1 if 1==1" \ ! "Breakpoint.*at.* file .*$srcfile, line $bp_location1\\." gdb_test "delete 3" "" *************** gdb_test "delete 3" "" *** 82,97 **** # test conditional break at function # gdb_test "break marker1 if (1==1)" \ ! "Breakpoint.*at.* file .*$srcfile, line.*" # # test conditional break at line number # ! gdb_test "break 79 if (1==1)" \ ! "Breakpoint.*at.* file .*$srcfile, line 79\\." gdb_test "break marker2 if (a==43)" \ ! "Breakpoint.*at.* file .*$srcfile, line.*" # # check to see what breakpoints are set --- 98,113 ---- # test conditional break at function # gdb_test "break marker1 if (1==1)" \ ! "Breakpoint.*at.* file .*$srcfile1, line.*" # # test conditional break at line number # ! gdb_test "break $srcfile:$bp_location1 if (1==1)" \ ! "Breakpoint.*at.* file .*$srcfile, line $bp_location1\\." gdb_test "break marker2 if (a==43)" \ ! "Breakpoint.*at.* file .*$srcfile1, line.*" # # check to see what breakpoints are set *************** if {$hp_aCC_compiler} { *** 105,119 **** set marker2_proto "" } - set main_line 75 gdb_test "info break" \ "Num Type\[ \]+Disp Enb Address\[ \]+What.* ! \[0-9\]+\[\t \]+breakpoint keep y.* in main at .*$srcfile:$main_line.* ! \[0-9\]+\[\t \]+breakpoint keep y.* in marker1$marker1_proto at .*$srcfile:4\[38\].* \[\t \]+stop only if 1 == 1.* ! \[0-9\]+\[\t \]+breakpoint keep y.* in main at .*$srcfile:79.* \[\t \]+stop only if 1 == 1.* ! \[0-9\]+\[\t \]+breakpoint keep y.* in marker2$marker2_proto at .*$srcfile:4\[49\].* \[\t \]+stop only if a == 43.*" \ "breakpoint info" --- 121,134 ---- set marker2_proto "" } gdb_test "info break" \ "Num Type\[ \]+Disp Enb Address\[ \]+What.* ! \[0-9\]+\[\t \]+breakpoint keep y.* in main at .*$srcfile:$bp_location6.* ! \[0-9\]+\[\t \]+breakpoint keep y.* in marker1$marker1_proto at .*$srcfile1:($bp_location15|$bp_location16).* \[\t \]+stop only if 1 == 1.* ! \[0-9\]+\[\t \]+breakpoint keep y.* in main at .*$srcfile:$bp_location1.* \[\t \]+stop only if 1 == 1.* ! \[0-9\]+\[\t \]+breakpoint keep y.* in marker2$marker2_proto at .*$srcfile1:($bp_location8|$bp_location9).* \[\t \]+stop only if a == 43.*" \ "breakpoint info" *************** rerun_to_main *** 128,134 **** # # run until the breakpoint at a line number # ! gdb_test "continue" "Continuing\\..*Breakpoint \[0-9\]+, main \\(argc=.*, argv=.*, envp=.*\\) at .*$srcfile:79.*79\[\t \]+printf.*factorial.*" \ "run until breakpoint set at a line number" # --- 143,149 ---- # # run until the breakpoint at a line number # ! gdb_test "continue" "Continuing\\..*Breakpoint \[0-9\]+, main \\(argc=.*, argv=.*, envp=.*\\) at .*$srcfile:$bp_location1.*$bp_location1\[\t \]+printf.*factorial.*" \ "run until breakpoint set at a line number" # *************** gdb_test "continue" "Continuing\\..*Brea *** 173,182 **** # Until the Dwarf2 writer gets fixed, I'm going to XFAIL its behavior. send_gdb "continue\n" gdb_expect { ! -re "Continuing\\..*Breakpoint \[0-9\]+, marker1 \\(\\) at .*$srcfile:4\[38\].*4\[38\]\[\t \]+.*$gdb_prompt $" { pass "run until breakpoint at marker1" } ! -re "Continuing\\..*Breakpoint \[0-9\]+, $hex in marker1 \\(\\) at .*$srcfile:4\[38\].*4\[38\]\[\t \]+.*$gdb_prompt $" { xfail "run until breakpoint at marker1" } -re "$gdb_prompt $" { --- 188,197 ---- # Until the Dwarf2 writer gets fixed, I'm going to XFAIL its behavior. send_gdb "continue\n" gdb_expect { ! -re "Continuing\\..*Breakpoint \[0-9\]+, marker1 \\(\\) at .*$srcfile1:($bp_location15|$bp_location16).*($bp_location15|$bp_location16)\[\t \]+.*$gdb_prompt $" { pass "run until breakpoint at marker1" } ! -re "Continuing\\..*Breakpoint \[0-9\]+, $hex in marker1 \\(\\) at .*$srcfile1:($bp_location15|$bp_location16).*($bp_location15|$bp_location16)\[\t \]+.*$gdb_prompt $" { xfail "run until breakpoint at marker1" } -re "$gdb_prompt $" { *************** gdb_expect { *** 192,201 **** setup_xfail hppa2.0w-*-* 11512CLLbs send_gdb "continue\n" gdb_expect { ! -re "Continuing\\..*Breakpoint \[0-9\]+, marker2 \\(a=43\\) at .*$srcfile:4\[49\].*4\[49\]\[\t \]+.*" { pass "run until breakpoint at marker2" } ! -re "Continuing\\..*Breakpoint \[0-9\]+, $hex in marker2 \\(a=43\\) at .*$srcfile:4\[49\].*4\[49\]\[\t \]+.*" { xfail "run until breakpoint at marker2" } -re "$gdb_prompt $" { --- 207,216 ---- setup_xfail hppa2.0w-*-* 11512CLLbs send_gdb "continue\n" gdb_expect { ! -re "Continuing\\..*Breakpoint \[0-9\]+, marker2 \\(a=43\\) at .*$srcfile1:($bp_location8|$bp_location9).*($bp_location8|$bp_location9)\[\t \]+.*" { pass "run until breakpoint at marker2" } ! -re "Continuing\\..*Breakpoint \[0-9\]+, $hex in marker2 \\(a=43\\) at .*$srcfile1:($bp_location8|$bp_location9).*($bp_location8|$bp_location9)\[\t \]+.*" { xfail "run until breakpoint at marker2" } -re "$gdb_prompt $" { Index: gdb.base/define.exp =================================================================== RCS file: /cvs/src/src/gdb/testsuite/gdb.base/define.exp,v retrieving revision 1.3 diff -c -p -r1.3 define.exp *** gdb.base/define.exp 23 May 2001 19:04:13 -0000 1.3 --- gdb.base/define.exp 7 Dec 2003 21:14:48 -0000 *************** set bug_id 0 *** 34,43 **** set testfile "break" set srcfile ${testfile}.c set binfile ${objdir}/${subdir}/${testfile} ! if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-w}] != "" } { ! gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail." } gdb_exit --- 34,52 ---- set testfile "break" set srcfile ${testfile}.c + set srcfile1 ${testfile}1.c set binfile ${objdir}/${subdir}/${testfile} ! if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}0.o" object {debug additional_flags=-w}] != "" } { ! gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail." ! } ! ! if { [gdb_compile "${srcdir}/${subdir}/${srcfile1}" "${binfile}1.o" object {debug additional_flags=-w}] != "" } { ! gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail." ! } ! ! if { [gdb_compile "${binfile}0.o ${binfile}1.o" "${binfile}" executable {debug additional_flags=-w}] != "" } { ! gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail." } gdb_exit *************** gdb_start *** 45,50 **** --- 54,62 ---- gdb_reinitialize_dir $srcdir/$subdir gdb_load ${binfile} + set bp_location1 [gdb_get_line_number "set breakpoint 1 here"] + set bp_location11 [gdb_get_line_number "set breakpoint 11 here"] + if ![runto_main] then { fail "define tests suppressed" } # Verify that GDB allows a user to define their very own commands. *************** gdb_expect { *** 68,74 **** # send_gdb "nextwhere\n" gdb_expect { ! -re ".*79\[ \t\]*printf.*#0\[ \t\]*main.*:79.*$gdb_prompt $"\ {pass "use user command: nextwhere"} -re "$gdb_prompt $"\ {fail "use user command: nextwhere"} --- 80,86 ---- # send_gdb "nextwhere\n" gdb_expect { ! -re ".*$bp_location1\[ \t\]*printf.*#0\[ \t\]*main.*:$bp_location1.*$gdb_prompt $"\ {pass "use user command: nextwhere"} -re "$gdb_prompt $"\ {fail "use user command: nextwhere"} *************** gdb_expect { *** 224,230 **** send_gdb "next\n" gdb_expect { ! -re "#0\[ \t\]*main.*:81.*$gdb_prompt $"\ {pass "use hook-stop command"} -re "$gdb_prompt $"\ {fail "use hook-stop command"} --- 236,242 ---- send_gdb "next\n" gdb_expect { ! -re "#0\[ \t\]*main.*:$bp_location11.*$gdb_prompt $"\ {pass "use hook-stop command"} -re "$gdb_prompt $"\ {fail "use hook-stop command"} Index: gdb.base/ena-dis-br.exp =================================================================== RCS file: /cvs/src/src/gdb/testsuite/gdb.base/ena-dis-br.exp,v retrieving revision 1.3 diff -c -p -r1.3 ena-dis-br.exp *** gdb.base/ena-dis-br.exp 18 Sep 2002 15:34:10 -0000 1.3 --- gdb.base/ena-dis-br.exp 7 Dec 2003 21:14:48 -0000 *************** set bug_id 0 *** 32,40 **** set testfile "break" 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." } --- 32,49 ---- set testfile "break" set srcfile ${testfile}.c + set srcfile1 ${testfile}1.c set binfile ${objdir}/${subdir}/${testfile} ! if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}0.o" object {debug additional_flags=-w}] != "" } { ! gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail." ! } ! ! if { [gdb_compile "${srcdir}/${subdir}/${srcfile1}" "${binfile}1.o" object {debug additional_flags=-w}] != "" } { ! gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail." ! } ! ! if { [gdb_compile "${binfile}0.o ${binfile}1.o" "${binfile}" executable {debug additional_flags=-w}] != "" } { gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail." } *************** gdb_start *** 43,48 **** --- 52,68 ---- gdb_reinitialize_dir $srcdir/$subdir gdb_load ${binfile} + set bp_location1 [gdb_get_line_number "set breakpoint 1 here"] + set bp_location8 [gdb_get_line_number "set breakpoint 8 here" $srcfile1] + set bp_location9 [gdb_get_line_number "set breakpoint 9 here" $srcfile1] + set bp_location11 [gdb_get_line_number "set breakpoint 11 here"] + set bp_location13 [gdb_get_line_number "set breakpoint 13 here" $srcfile1] + set bp_location14 [gdb_get_line_number "set breakpoint 14 here" $srcfile1] + set bp_location15 [gdb_get_line_number "set breakpoint 15 here" $srcfile1] + set bp_location16 [gdb_get_line_number "set breakpoint 16 here" $srcfile1] + set bp_location17 [gdb_get_line_number "set breakpoint 17 here" $srcfile1] + set bp_location18 [gdb_get_line_number "set breakpoint 18 here" $srcfile1] + if ![runto_main] then { fail "enable/disable break tests suppressed" } # Verify that we can set a breakpoint (the location is irrelevant), *************** if ![runto_main] then { fail "enable/dis *** 50,56 **** # send_gdb "break marker1\n" gdb_expect { ! -re "Breakpoint (\[0-9\]*) at .*, line 4\[38\].*$gdb_prompt $"\ {pass "break marker1"} -re "$gdb_prompt $"\ {fail "break marker1"} --- 70,76 ---- # send_gdb "break marker1\n" gdb_expect { ! -re "Breakpoint (\[0-9\]*) at .*, line ($bp_location15|$bp_location16).*$gdb_prompt $"\ {pass "break marker1"} -re "$gdb_prompt $"\ {fail "break marker1"} *************** gdb_expect { *** 98,104 **** # send_gdb "break marker2\n" gdb_expect { ! -re "Breakpoint (\[0-9\]*) at .*, line 4\[49\].*$gdb_prompt $"\ {pass "break marker2"} -re "$gdb_prompt $"\ {fail "break marker2"} --- 118,124 ---- # send_gdb "break marker2\n" gdb_expect { ! -re "Breakpoint (\[0-9\]*) at .*, line ($bp_location8|$bp_location9).*$gdb_prompt $"\ {pass "break marker2"} -re "$gdb_prompt $"\ {fail "break marker2"} *************** if ![runto_main] then { fail "enable/dis *** 156,162 **** send_gdb "break marker3\n" gdb_expect { ! -re "Breakpoint (\[0-9\]*) at .*, line (45|50).*$gdb_prompt $"\ {pass "break marker3"} -re "$gdb_prompt $"\ {fail "break marker3"} --- 176,182 ---- send_gdb "break marker3\n" gdb_expect { ! -re "Breakpoint (\[0-9\]*) at .*, line ($bp_location17|$bp_location18).*$gdb_prompt $"\ {pass "break marker3"} -re "$gdb_prompt $"\ {fail "break marker3"} *************** gdb_expect { *** 181,187 **** send_gdb "continue\n" gdb_expect { ! -re ".*marker3 .*:(45|50).*$gdb_prompt $"\ {pass "continue to auto-deleted break marker3"} -re "Breakpoint \[0-9\]*, marker3.*$gdb_prompt $"\ {fail "continue to auto-deleted break marker3"} --- 201,207 ---- send_gdb "continue\n" gdb_expect { ! -re ".*marker3 .*:($bp_location17|$bp_location18).*$gdb_prompt $"\ {pass "continue to auto-deleted break marker3"} -re "Breakpoint \[0-9\]*, marker3.*$gdb_prompt $"\ {fail "continue to auto-deleted break marker3"} *************** gdb_expect { *** 206,212 **** # send_gdb "break marker4\n" gdb_expect { ! -re "Breakpoint (\[0-9\]*) at .*, line (46|51).*$gdb_prompt $"\ {pass "break marker4"} -re "$gdb_prompt $"\ {fail "break marker4"} --- 226,232 ---- # send_gdb "break marker4\n" gdb_expect { ! -re "Breakpoint (\[0-9\]*) at .*, line ($bp_location14|$bp_location13).*$gdb_prompt $"\ {pass "break marker4"} -re "$gdb_prompt $"\ {fail "break marker4"} *************** if ![runto_main] then { fail "enable/dis *** 237,243 **** send_gdb "break marker1\n" gdb_expect { ! -re "Breakpoint (\[0-9\]*) at .*, line 4\[38\].*$gdb_prompt $"\ {pass "break marker1"} -re "$gdb_prompt $"\ {fail "break marker1"} --- 257,263 ---- send_gdb "break marker1\n" gdb_expect { ! -re "Breakpoint (\[0-9\]*) at .*, line ($bp_location15|$bp_location16).*$gdb_prompt $"\ {pass "break marker1"} -re "$gdb_prompt $"\ {fail "break marker1"} *************** if ![runto_main] then { fail "enable/dis *** 328,334 **** send_gdb "break marker1\n" gdb_expect { ! -re "Breakpoint (\[0-9\]*) at .*, line 4\[38\].*$gdb_prompt $"\ {pass "break marker1"} -re "$gdb_prompt $"\ {fail "break marker1"} --- 348,354 ---- send_gdb "break marker1\n" gdb_expect { ! -re "Breakpoint (\[0-9\]*) at .*, line ($bp_location15|$bp_location16).*$gdb_prompt $"\ {pass "break marker1"} -re "$gdb_prompt $"\ {fail "break marker1"} *************** rerun_to_main *** 365,371 **** send_gdb "continue\n" gdb_expect { ! -re ".*marker1 .*:4\[38\].*$gdb_prompt $"\ {pass "continue to ignored & auto-deleted break marker1"} -re "Breakpoint \[0-9\]*, marker1.*$gdb_prompt $"\ {fail "continue to ignored & auto-deleted break marker1"} --- 385,391 ---- send_gdb "continue\n" gdb_expect { ! -re ".*marker1 .*:($bp_location15|$bp_location16).*$gdb_prompt $"\ {pass "continue to ignored & auto-deleted break marker1"} -re "Breakpoint \[0-9\]*, marker1.*$gdb_prompt $"\ {fail "continue to ignored & auto-deleted break marker1"} *************** if ![runto_main] then { fail "enable/dis *** 381,387 **** send_gdb "break marker1\n" gdb_expect { ! -re "Breakpoint (\[0-9\]*) at .*, line 4\[38\].*$gdb_prompt $"\ {pass "break marker1"} -re "$gdb_prompt $"\ {fail "break marker1"} --- 401,407 ---- send_gdb "break marker1\n" gdb_expect { ! -re "Breakpoint (\[0-9\]*) at .*, line ($bp_location15|$bp_location16).*$gdb_prompt $"\ {pass "break marker1"} -re "$gdb_prompt $"\ {fail "break marker1"} *************** gdb_expect { *** 423,431 **** # if ![runto_main] then { fail "enable/disable break tests suppressed" } ! send_gdb "break 79\n" gdb_expect { ! -re "Breakpoint \[0-9\]*.*, line 79.*$gdb_prompt $"\ {pass "prepare to continue with ignore count"} -re "$gdb_prompt $"\ {fail "prepare to continue with ignore count"} --- 443,451 ---- # if ![runto_main] then { fail "enable/disable break tests suppressed" } ! send_gdb "break $bp_location1\n" gdb_expect { ! -re "Breakpoint \[0-9\]*.*, line $bp_location1.*$gdb_prompt $"\ {pass "prepare to continue with ignore count"} -re "$gdb_prompt $"\ {fail "prepare to continue with ignore count"} *************** gdb_expect { *** 442,448 **** send_gdb "next\n" gdb_expect { ! -re ".*81\[ \t\]*marker1.*$gdb_prompt $"\ {pass "step after continue with ignore count"} -re "$gdb_prompt $"\ {fail "step after continue with ignore count"} --- 462,468 ---- send_gdb "next\n" gdb_expect { ! -re ".*$bp_location11\[ \t\]*marker1.*$gdb_prompt $"\ {pass "step after continue with ignore count"} -re "$gdb_prompt $"\ {fail "step after continue with ignore count"} Index: gdb.base/info-proc.exp =================================================================== RCS file: /cvs/src/src/gdb/testsuite/gdb.base/info-proc.exp,v retrieving revision 1.1 diff -c -p -r1.1 info-proc.exp *** gdb.base/info-proc.exp 5 Jan 2002 02:44:07 -0000 1.1 --- gdb.base/info-proc.exp 7 Dec 2003 21:14:48 -0000 *************** if $tracelevel then { *** 27,38 **** set prms_id 0 set bug_id 0 - set testfile "break" - set srcfile ${testfile}.c - set binfile ${objdir}/${subdir}/${testfile} set ws "\[ \t\]+" ! 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." } --- 27,48 ---- set prms_id 0 set bug_id 0 set ws "\[ \t\]+" ! set testfile "break" ! set srcfile ${testfile}.c ! set srcfile1 ${testfile}1.c ! set binfile ${objdir}/${subdir}/${testfile} ! ! if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}0.o" object {debug additional_flags=-w}] != "" } { ! gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail." ! } ! ! if { [gdb_compile "${srcdir}/${subdir}/${srcfile1}" "${binfile}1.o" object {debug additional_flags=-w}] != "" } { ! gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail." ! } ! ! if { [gdb_compile "${binfile}0.o ${binfile}1.o" "${binfile}" executable {debug additional_flags=-w}] != "" } { gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail." } Index: gdb.base/maint.exp =================================================================== RCS file: /cvs/src/src/gdb/testsuite/gdb.base/maint.exp,v retrieving revision 1.20 diff -c -p -r1.20 maint.exp *** gdb.base/maint.exp 20 Nov 2003 15:36:34 -0000 1.20 --- gdb.base/maint.exp 7 Dec 2003 21:14:49 -0000 *************** set bug_id 0 *** 65,74 **** set testfile "break" set srcfile ${testfile}.c set binfile ${objdir}/${subdir}/${testfile} ! if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-w}] != "" ! } { ! gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail." } --- 65,83 ---- set testfile "break" set srcfile ${testfile}.c + set srcfile1 ${testfile}1.c set binfile ${objdir}/${subdir}/${testfile} ! ! if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}0.o" object {debug additional_flags=-w}] != "" } { ! gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail." ! } ! ! if { [gdb_compile "${srcdir}/${subdir}/${srcfile1}" "${binfile}1.o" object {debug additional_flags=-w}] != "" } { ! gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail." ! } ! ! if { [gdb_compile "${binfile}0.o ${binfile}1.o" "${binfile}" executable {debug additional_flags=-w}] != "" } { ! gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail." } *************** gdb_expect { *** 412,422 **** timeout { fail "(timeout) maint info sections DATA" } } send_gdb "maint info breakpoints\n" gdb_expect { ! -re "Num\[ \t\]+Type\[ \t\]+Disp\[ \t\]+Enb\[ \t\]+Address\[ \t\]+What\r\n1\[ \t\]+breakpoint\[ \t\]+keep\[ \t\]+y\[ \t\]+$hex\[ \t\]+in main at.*break.c:75\r\n\[ \t\]+breakpoint already hit 1 time\r\n.*$gdb_prompt $"\ { pass "maint info breakpoints" } ! -re "Num\[ \t\]+Type\[ \t\]+Disp\[ \t\]+Enb\[ \t\]+Address\[ \t\]+What\r\n1\[ \t\]+breakpoint\[ \t\]+keep\[ \t\]+y\[ \t\]+$hex in main at.*break.c:75\r\n\[ \t\]+breakpoint already hit 1 time\r\n-1\[ \t\]+shlib events\[ \t\]+keep\[ \t\]+y\[ \t\]+$hex.*breakpoint already hit.*$gdb_prompt $"\ { pass "maint info breakpoints (with shlib events)" } -re ".*$gdb_prompt $" { fail "maint info breakpoints" } timeout { fail "(timeout) maint info breakpoints" } --- 421,433 ---- timeout { fail "(timeout) maint info sections DATA" } } + set bp_location6 [gdb_get_line_number "set breakpoint 6 here"] + send_gdb "maint info breakpoints\n" gdb_expect { ! -re "Num\[ \t\]+Type\[ \t\]+Disp\[ \t\]+Enb\[ \t\]+Address\[ \t\]+What\r\n1\[ \t\]+breakpoint\[ \t\]+keep\[ \t\]+y\[ \t\]+$hex\[ \t\]+in main at.*break.c:$bp_location6\r\n\[ \t\]+breakpoint already hit 1 time\r\n.*$gdb_prompt $"\ { pass "maint info breakpoints" } ! -re "Num\[ \t\]+Type\[ \t\]+Disp\[ \t\]+Enb\[ \t\]+Address\[ \t\]+What\r\n1\[ \t\]+breakpoint\[ \t\]+keep\[ \t\]+y\[ \t\]+$hex in main at.*break.c:$bp_location6\r\n\[ \t\]+breakpoint already hit 1 time\r\n-1\[ \t\]+shlib events\[ \t\]+keep\[ \t\]+y\[ \t\]+$hex.*breakpoint already hit.*$gdb_prompt $"\ { pass "maint info breakpoints (with shlib events)" } -re ".*$gdb_prompt $" { fail "maint info breakpoints" } timeout { fail "(timeout) maint info breakpoints" } Index: gdb.base/until.exp =================================================================== RCS file: /cvs/src/src/gdb/testsuite/gdb.base/until.exp,v retrieving revision 1.3 diff -c -p -r1.3 until.exp *** gdb.base/until.exp 3 Feb 2003 16:04:18 -0000 1.3 --- gdb.base/until.exp 7 Dec 2003 21:14:49 -0000 *************** if $tracelevel then { *** 23,35 **** strace $tracelevel } ! set testfile break set srcfile ${testfile}.c set binfile ${objdir}/${subdir}/${testfile} ! remote_exec build "rm -f ${binfile}" ! 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." } gdb_exit --- 23,43 ---- strace $tracelevel } ! set testfile "break" set srcfile ${testfile}.c + set srcfile1 ${testfile}1.c set binfile ${objdir}/${subdir}/${testfile} ! if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}0.o" object {debug additional_flags=-w}] != "" } { ! gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail." ! } ! ! if { [gdb_compile "${srcdir}/${subdir}/${srcfile1}" "${binfile}1.o" object {debug additional_flags=-w}] != "" } { ! gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail." ! } ! ! if { [gdb_compile "${binfile}0.o ${binfile}1.o" "${binfile}" executable {debug additional_flags=-w}] != "" } { ! gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail." } gdb_exit *************** gdb_start *** 37,42 **** --- 45,55 ---- gdb_reinitialize_dir $srcdir/$subdir gdb_load ${binfile} + set bp_location1 [gdb_get_line_number "set breakpoint 1 here"] + set bp_location19 [gdb_get_line_number "set breakpoint 19 here"] + set bp_location20 [gdb_get_line_number "set breakpoint 20 here"] + set bp_location21 [gdb_get_line_number "set breakpoint 21 here"] + if ![runto_main] then { fail "Can't run to main" return 0 *************** if ![runto_main] then { *** 45,52 **** # Verify that "until " works. (This is really just syntactic # sugar for "tbreak ; continue".) # ! gdb_test "until 79" \ ! "main .* at .*:79.*" \ "until line number" # Verify that a malformed "advance" is gracefully caught. --- 58,65 ---- # Verify that "until " works. (This is really just syntactic # sugar for "tbreak ; continue".) # ! gdb_test "until $bp_location1" \ ! "main .* at .*:$bp_location1.*" \ "until line number" # Verify that a malformed "advance" is gracefully caught. *************** delete_breakpoints *** 62,69 **** # inner invocations of factorial() are completed and we are back at this # frame. # ! gdb_test "until 99" \ ! "factorial.*value=720.*at.*${srcfile}:99.*return \\(value\\)." \ "until factorial, recursive function" # Run to a function called by main --- 75,82 ---- # inner invocations of factorial() are completed and we are back at this # frame. # ! gdb_test "until $bp_location19" \ ! "factorial.*value=720.*at.*${srcfile}:$bp_location19.*return \\(value\\).*" \ "until factorial, recursive function" # Run to a function called by main *************** delete_breakpoints *** 76,81 **** # stop at main, the caller, where we put the 'guard' breakpoint. # gdb_test "until marker3" \ ! "($hex in |)main.*argc.*argv.*envp.*at.*${srcfile}:(82.*marker2 \\(43\\)|83.*marker3 \\(.stack., .trace.\\))." \ "until func, not called by current frame" --- 89,94 ---- # stop at main, the caller, where we put the 'guard' breakpoint. # gdb_test "until marker3" \ ! "($hex in |)main.*argc.*argv.*envp.*at.*${srcfile}:($bp_location20.*marker2 \\(43\\)|$bp_location21.*marker3 \\(.stack., .trace.\\)).*" \ "until func, not called by current frame" --Boundary-00=_Nn50/Bj96I3hKo+--