From patchwork Wed Oct 29 16:00:17 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Arnez X-Patchwork-Id: 3465 Received: (qmail 8627 invoked by alias); 29 Oct 2014 16:01:10 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 8618 invoked by uid 89); 29 Oct 2014 16:01:09 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.6 required=5.0 tests=AWL, BAYES_00, RP_MATCHES_RCVD autolearn=ham version=3.3.2 X-HELO: e06smtp12.uk.ibm.com Received: from e06smtp12.uk.ibm.com (HELO e06smtp12.uk.ibm.com) (195.75.94.108) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-SHA encrypted) ESMTPS; Wed, 29 Oct 2014 16:01:08 +0000 Received: from /spool/local by e06smtp12.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 29 Oct 2014 16:01:05 -0000 Received: from d06dlp02.portsmouth.uk.ibm.com (9.149.20.14) by e06smtp12.uk.ibm.com (192.168.101.142) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Wed, 29 Oct 2014 16:01:03 -0000 Received: from b06cxnps3075.portsmouth.uk.ibm.com (d06relay10.portsmouth.uk.ibm.com [9.149.109.195]) by d06dlp02.portsmouth.uk.ibm.com (Postfix) with ESMTP id 8AD5B2190043 for ; Wed, 29 Oct 2014 16:00:38 +0000 (GMT) Received: from d06av05.portsmouth.uk.ibm.com (d06av05.portsmouth.uk.ibm.com [9.149.37.229]) by b06cxnps3075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id s9TG135v17105178 for ; Wed, 29 Oct 2014 16:01:03 GMT Received: from d06av05.portsmouth.uk.ibm.com (localhost [127.0.0.1]) by d06av05.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id s9TG12lg000419 for ; Wed, 29 Oct 2014 10:01:02 -0600 Received: from br87z6lw.boeblingen.de.ibm.com (dyn-9-152-212-196.boeblingen.de.ibm.com [9.152.212.196]) by d06av05.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id s9TG0lWL032270 for ; Wed, 29 Oct 2014 10:01:02 -0600 From: Andreas Arnez To: gdb-patches@sourceware.org Subject: [PATCH 02/16] Eliminate literal line numbers in dbx.exp Date: Wed, 29 Oct 2014 17:00:17 +0100 Message-Id: <1414598446-13831-2-git-send-email-arnez@linux.vnet.ibm.com> In-Reply-To: <1414597859-12523-1-git-send-email-arnez@linux.vnet.ibm.com> References: <1414597859-12523-1-git-send-email-arnez@linux.vnet.ibm.com> X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 14102916-0009-0000-0000-000001BCE91E X-IsSubscribed: yes Remove literal line numbers from the commands and regexps in dbx.exp. Add appropriate eye-catchers to average.c and sum.c and refer to those instead. gdb/testsuite/ChangeLog: * gdb.base/average.c: Add eye-catchers. * gdb.base/sum.c: Likewise. * gdb.base/dbx.exp: Use eye-catchers to determine line numbers for regexps dynamically. --- gdb/testsuite/gdb.base/average.c | 4 ++-- gdb/testsuite/gdb.base/dbx.exp | 16 ++++++++++------ gdb/testsuite/gdb.base/sum.c | 2 +- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/gdb/testsuite/gdb.base/average.c b/gdb/testsuite/gdb.base/average.c index e1695ce..99c28cf 100644 --- a/gdb/testsuite/gdb.base/average.c +++ b/gdb/testsuite/gdb.base/average.c @@ -35,12 +35,12 @@ main () #endif { char c; - int first = 0, last = 0; + int first = 0, last = 0; /* stop-in-main */ last = num-1; /* Try two test cases. */ print_average (my_list, first, last); - print_average (my_list, first, last - 3); + print_average (my_list, first, last - 3); /* stop-at-call */ exit(0); } diff --git a/gdb/testsuite/gdb.base/dbx.exp b/gdb/testsuite/gdb.base/dbx.exp index 4383e79..20d21d1 100644 --- a/gdb/testsuite/gdb.base/dbx.exp +++ b/gdb/testsuite/gdb.base/dbx.exp @@ -243,10 +243,12 @@ proc gdb_file_cmd {arg} { #test_breakpoints # proc test_breakpoints { } { - gdb_test "stop in main" "Breakpoint.*at.*: file.*average\.c, line 38\." - gdb_test "status" "Num.*Type.*Disp.*Enb.*Address.*What\r\n1\[ \r\]+breakpoint\[ \r\]+keep y.*in main at.*average\.c:38.*" - gdb_test "stop at average.c:43" "Breakpoint.*at.*: file.*average\.c, line 43.*" - gdb_test "stop in average.c:43" "Usage: stop in " + set stop_line [gdb_get_line_number "stop-in-main"] + gdb_test "stop in main" "Breakpoint.*at.*: file.*average\.c, line $stop_line\." + gdb_test "status" "Num.*Type.*Disp.*Enb.*Address.*What\r\n1\[ \r\]+breakpoint\[ \r\]+keep y.*in main at.*average\.c:$stop_line.*" + set stop_line [gdb_get_line_number "stop-at-call"] + gdb_test "stop at average.c:$stop_line" "Breakpoint.*at.*: file.*average\.c, line $stop_line.*" + gdb_test "stop in average.c:$stop_line" "Usage: stop in " gdb_test "stop at main" "Usage: stop at " } @@ -287,16 +289,18 @@ proc test_whereis { } { #test_func # proc test_func { } { + global srcfile2 gdb_test "cont" ".*" "cont 1" gdb_test "step" ".*" # This always fails, but it's not clear why. -sts 1999-08-17 setup_xfail "*-*-*" gdb_test "func sum" "'sum' not within current stack frame\." - gdb_test "stop in sum" "Breakpoint.*at.*: file.*sum\.c, line 11\." + set stop_line [gdb_get_line_number "stop-in-sum" $srcfile2] + gdb_test "stop in sum" "Breakpoint.*at.*: file.*sum\.c, line $stop_line\." gdb_test "cont" ".*" "cont 2" # This always fails, but it's not clear why. -sts 1999-08-17 setup_xfail "*-*-*" - gdb_test "func print_average" ".*in print_average.*\\(list=.*, low=0, high=6\\).*at.*average\.c:24\r\n24\[ \t\]+total = sum\\(list, low, high\\);" + gdb_test "func print_average" ".*in print_average.*\\(list=.*, low=0, high=6\\).*at.*average\.c:\[0-9\]+\r\n\[0-9\]+\[ \t\]+total = sum\\(list, low, high\\);" } # Start with a fresh gdb. diff --git a/gdb/testsuite/gdb.base/sum.c b/gdb/testsuite/gdb.base/sum.c index f5a5dbf..6dd7a75 100644 --- a/gdb/testsuite/gdb.base/sum.c +++ b/gdb/testsuite/gdb.base/sum.c @@ -8,7 +8,7 @@ int sum(list, low, high) int *list, low, high; #endif { - int i = 0, s = 0; + int i = 0, s = 0; /* stop-in-sum */ for (i = low; i <= high; i++) s += list[i]; return(s);