From patchwork Fri Nov 14 18:47:25 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Arnez X-Patchwork-Id: 3747 Received: (qmail 2284 invoked by alias); 14 Nov 2014 18:47:35 -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 2210 invoked by uid 89); 14 Nov 2014 18:47:35 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.3 required=5.0 tests=AWL, BAYES_00, T_RP_MATCHES_RCVD autolearn=ham version=3.3.2 X-HELO: e06smtp13.uk.ibm.com Received: from e06smtp13.uk.ibm.com (HELO e06smtp13.uk.ibm.com) (195.75.94.109) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-SHA encrypted) ESMTPS; Fri, 14 Nov 2014 18:47:32 +0000 Received: from /spool/local by e06smtp13.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 14 Nov 2014 18:47:29 -0000 Received: from d06dlp01.portsmouth.uk.ibm.com (9.149.20.13) by e06smtp13.uk.ibm.com (192.168.101.143) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Fri, 14 Nov 2014 18:47:27 -0000 Received: from b06cxnps4076.portsmouth.uk.ibm.com (d06relay13.portsmouth.uk.ibm.com [9.149.109.198]) by d06dlp01.portsmouth.uk.ibm.com (Postfix) with ESMTP id 7A10B17D8024 for ; Fri, 14 Nov 2014 18:47:37 +0000 (GMT) Received: from d06av06.portsmouth.uk.ibm.com (d06av06.portsmouth.uk.ibm.com [9.149.37.217]) by b06cxnps4076.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id sAEIlRCo51183808 for ; Fri, 14 Nov 2014 18:47:27 GMT Received: from d06av06.portsmouth.uk.ibm.com (localhost [127.0.0.1]) by d06av06.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id sAEDigSf025459 for ; Fri, 14 Nov 2014 08:44:42 -0500 Received: from br87z6lw.boeblingen.de.ibm.com (dyn-9-152-212-196.boeblingen.de.ibm.com [9.152.212.196]) by d06av06.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id sAEDif2g025442 for ; Fri, 14 Nov 2014 08:44:42 -0500 From: Andreas Arnez To: gdb-patches@sourceware.org Subject: [PATCH 2/3] Eliminate literal line numbers in mi-until.exp Date: Fri, 14 Nov 2014 19:47:25 +0100 Message-Id: <1415990846-9482-3-git-send-email-arnez@linux.vnet.ibm.com> In-Reply-To: <1415990846-9482-1-git-send-email-arnez@linux.vnet.ibm.com> References: <1415990846-9482-1-git-send-email-arnez@linux.vnet.ibm.com> X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 14111418-0013-0000-0000-000001DCA91D X-IsSubscribed: yes Remove literal line numbers from the regexps in mi-until.exp. Add appropriate eye-catchers to until.c and refer to those instead. This change fixes the test case after having disturbed the line numbering with the previous fix for compiler warnings with -std=gnu11. gdb/testsuite/ChangeLog: * gdb.mi/until.c: Add eye-catchers. * gdb.mi/mi-until.exp: Refer to eye-catchers instead of literal line numbers. --- gdb/testsuite/gdb.mi/mi-until.exp | 23 +++++++++++++++-------- gdb/testsuite/gdb.mi/until.c | 10 +++++----- 2 files changed, 20 insertions(+), 13 deletions(-) diff --git a/gdb/testsuite/gdb.mi/mi-until.exp b/gdb/testsuite/gdb.mi/mi-until.exp index 3fabcd2..2d0bc4e 100644 --- a/gdb/testsuite/gdb.mi/mi-until.exp +++ b/gdb/testsuite/gdb.mi/mi-until.exp @@ -42,12 +42,13 @@ mi_gdb_reinitialize_dir $srcdir/$subdir mi_gdb_load ${binfile} proc test_running_to_foo {} { - mi_create_breakpoint "10" \ + set line [gdb_get_line_number "in-loop"] + mi_create_breakpoint $line \ "break-insert operation" \ - -number 1 -func foo -file ".*until.c" -line 10 + -number 1 -func foo -file ".*until.c" -line $line mi_run_cmd - mi_expect_stop "breakpoint-hit" "foo" "" ".*until.c" 10 \ + mi_expect_stop "breakpoint-hit" "foo" "" ".*until.c" $line \ { "" "disp=\"keep\"" } "run to main" mi_gdb_test "100-break-delete 1" "100\\^done" "break-delete 1" @@ -56,17 +57,23 @@ proc test_running_to_foo {} { proc test_until {} { setup_kfail gdb/2104 "*-*-*" - mi_execute_to "exec-until" "end-stepping-range" "foo" "" ".*until.c" "12" "" \ + set line [gdb_get_line_number "after-loop"] + mi_execute_to "exec-until" "end-stepping-range" "foo" "" ".*until.c" $line "" \ "until after while loop" - mi_execute_to "exec-until 15" "location-reached" "foo" "" ".*until.c" "15" ""\ + set line [gdb_get_line_number "until-here"] + mi_execute_to "exec-until $line" "location-reached" "foo" "" ".*until.c" $line ""\ "until line number" - mi_execute_to "exec-until until.c:17" "location-reached" "foo" "" ".*until.c" "17" ""\ + set line [gdb_get_line_number "until-there"] + mi_execute_to "exec-until until.c:$line" "location-reached" "foo" "" ".*until.c" $line ""\ "until line number:file" - # This is supposed to NOT stop at line 25. It stops right after foo is over. - mi_execute_to "exec-until until.c:25" "location-reached" "main" "" ".*until.c" "(23|24)" ""\ + # This is supposed to NOT stop at the return statement, but right + # after foo is over. + set line [gdb_get_line_number "at-return"] + mi_execute_to "exec-until until.c:$line" "location-reached" "main" ""\ + ".*until.c" "([expr $line-2]|[expr $line-1])" ""\ "until after current function" } diff --git a/gdb/testsuite/gdb.mi/until.c b/gdb/testsuite/gdb.mi/until.c index 21bdeda..83beea0 100644 --- a/gdb/testsuite/gdb.mi/until.c +++ b/gdb/testsuite/gdb.mi/until.c @@ -8,14 +8,14 @@ foo (void) i = 0; while (i < 2) - i++; + i++; /* in-loop */ - x = i; + x = i; /* after-loop */ y = 2 * x; z = x + y; - y = x + z; + y = x + z; /* until-here */ x = 9; - y = 10; + y = 10; /* until-there */ } int @@ -24,5 +24,5 @@ main () int a = 1; foo (); a += 2; - return 0; + return 0; /* at-return */ }