From 066a77c58038e1ecf0a18d51b28d7bab303e8234 Mon Sep 17 00:00:00 2001 From: Andreas Arnez Date: Thu, 23 Oct 2014 11:02:31 +0000 Subject: [PATCH] Drop non-prototype C function header variants: 'sepdebug' test case Remove old-style function header variants from sepdebug.c. Eliminate references to the removed locations "breakpoint 9" and "breakpoint 13" from sepdebug.exp. gdb/testsuite/ChangeLog: * gdb.base/sepdebug.c: Remove #ifdef PROTOTYPES, keep prototyped variant. * gdb.base/sepdebug.exp: Drop references to removed code. --- gdb/testsuite/ChangeLog | 6 ++++++ gdb/testsuite/gdb.base/sepdebug.c | 29 ---------------------------- gdb/testsuite/gdb.base/sepdebug.exp | 30 ++++++++++++----------------- 3 files changed, 18 insertions(+), 47 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index e67ab40c32e..bdf713fa008 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2014-11-13 Andreas Arnez + + * gdb.base/sepdebug.c: Remove #ifdef PROTOTYPES, keep prototyped + variant. + * gdb.base/sepdebug.exp: Drop references to removed code. + 2014-11-13 Andreas Arnez * gdb.base/list0.h: Remove #ifdef PROTOTYPES, keep prototyped diff --git a/gdb/testsuite/gdb.base/sepdebug.c b/gdb/testsuite/gdb.base/sepdebug.c index 21e62001cba..36c97339b91 100644 --- a/gdb/testsuite/gdb.base/sepdebug.c +++ b/gdb/testsuite/gdb.base/sepdebug.c @@ -23,34 +23,20 @@ * 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 /* * This simple classical example of recursion is useful for * testing stack backtraces and such. */ -#ifdef PROTOTYPES int factorial(int); int main (int argc, char **argv, char **envp) -#else -int -main (argc, argv, envp) -int argc; -char *argv[], **envp; -#endif { if (argc == 12345) { /* an unlikely value < 2^16, in case uninited */ /* set breakpoint 6 here */ fprintf (stderr, "usage: factorial \n"); @@ -66,12 +52,7 @@ char *argv[], **envp; return argc; /* set breakpoint 10 here */ } -#ifdef PROTOTYPES int factorial (int value) -#else -int factorial (value) -int value; -#endif { if (value > 1) { /* set breakpoint 7 here */ value *= factorial (value - 1); @@ -79,12 +60,7 @@ int value; return (value); } -#ifdef PROTOTYPES int multi_line_if_conditional (int a, int b, int c) -#else -int multi_line_if_conditional (a, b, c) - int a, b, c; -#endif { if (a /* set breakpoint 3 here */ && b @@ -94,12 +70,7 @@ int multi_line_if_conditional (a, b, c) return 1; } -#ifdef PROTOTYPES int multi_line_while_conditional (int a, int b, int c) -#else -int multi_line_while_conditional (a, b, c) - int a, b, c; -#endif { while (a /* set breakpoint 4 here */ && b diff --git a/gdb/testsuite/gdb.base/sepdebug.exp b/gdb/testsuite/gdb.base/sepdebug.exp index b1ca433f420..d6abf9a7bda 100644 --- a/gdb/testsuite/gdb.base/sepdebug.exp +++ b/gdb/testsuite/gdb.base/sepdebug.exp @@ -111,7 +111,7 @@ set bp_location1 [gdb_get_line_number "set breakpoint 1 here"] # board. So, to be sure, we do a list command. # gdb_test "list main" \ - ".*main \\(argc, argv, envp\\).*" \ + ".*main \\(int argc, char \\*\\*argv, char \\*\\*envp\\).*" \ "use `list' to establish default source file" gdb_test "break $bp_location1" \ "Breakpoint.*at.* file .*$srcfile, line $bp_location1\\." \ @@ -154,12 +154,11 @@ set main_line $bp_location6 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 marker2 at .*$srcfile:$bp_location8.* \[0-9\]+\[\t \]+breakpoint keep y.* in factorial 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.* @@ -198,7 +197,7 @@ for {set i 6} {$i >= 1} {incr i -1} { # # 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).*" \ +gdb_test continue "Continuing\\..*Breakpoint \[0-9\]+, (0x\[0-9a-f\]+ in )?marker2 \\(a=43\\) at .*$srcfile:$bp_location8.*" \ "run until quoted breakpoint" # # run until the file:function breakpoint at a line number in a file @@ -448,7 +447,7 @@ gdb_test "break \$foo" \ # gdb_test "break marker2" \ - "Breakpoint (\[0-9\]*) at .*, line ($bp_location8|$bp_location9).*" \ + "Breakpoint (\[0-9\]*) at .*, line $bp_location8.*" \ "set breakpoint on to-be-called function" gdb_test "print marker2(99)" \ @@ -463,10 +462,10 @@ gdb_test "print marker2(99)" \ # gdb_test_multiple "bt" "backtrace while in called function" { - -re "#0\[ \t\]*($hex in )?marker2.*:($bp_location8|$bp_location9)\r\n#1.*_sr4export.*$gdb_prompt $" { + -re "#0\[ \t\]*($hex in )?marker2.*:$bp_location8\r\n#1.*_sr4export.*$gdb_prompt $" { pass "backtrace while in called function" } - -re "#0\[ \t\]*($hex in )?marker2.*:($bp_location8|$bp_location9)\r\n#1.*function called from gdb.*$gdb_prompt $" { + -re "#0\[ \t\]*($hex in )?marker2.*:$bp_location8\r\n#1.*function called from gdb.*$gdb_prompt $" { pass "backtrace while in called function" } } @@ -477,13 +476,13 @@ gdb_test_multiple "bt" "backtrace while in called function" { # gdb_test_multiple "finish" "finish from called function" { - -re "Run till exit from .*marker2.* at .*($bp_location8|$bp_location9)\r\n.* in _sr4export.*$gdb_prompt $" { + -re "Run till exit from .*marker2.* at .*$bp_location8\r\n.* in _sr4export.*$gdb_prompt $" { pass "finish from called function" } - -re "Run till exit from .*marker2.* at .*($bp_location8|$bp_location9)\r\n.*function called from gdb.*$gdb_prompt $" { + -re "Run till exit from .*marker2.* at .*$bp_location8\r\n.*function called from gdb.*$gdb_prompt $" { pass "finish from called function" } - -re "Run till exit from .*marker2.* at .*($bp_location8|$bp_location9)\r\n.*Value returned.*$gdb_prompt $" { + -re "Run till exit from .*marker2.* at .*$bp_location8\r\n.*Value returned.*$gdb_prompt $" { pass "finish from called function" } } @@ -694,21 +693,16 @@ proc test_different_dir {type test_different_dir xfail} { # 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"] if {$xfail} { setup_xfail "*-*-*" } gdb_test_multiple "continue" "run until breakpoint set at small function, optimized file" { - -re "Breakpoint $decimal, marker4 \\(d=177601976\\) at .*$srcfile:$bp_location13\[\r\n\]+$bp_location13\[\t \]+void marker4.*$gdb_prompt $" { - 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.*$gdb_prompt $" { - 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.*$gdb_prompt $" { - # marker4() is defined at line 46 when compiled with -DPROTOTYPES + pass "run until breakpoint set at small function, optimized file (line bp_location14)" + } + -re "Breakpoint $decimal, $hex in marker4 \\(d=177601976\\) at .*$srcfile:$bp_location14\[\r\n\]+$bp_location14\[\t \]+void marker4.*$gdb_prompt $" { pass "run until breakpoint set at small function, optimized file (line bp_location14)" } } -- 2.30.2