From patchwork Wed Mar 14 16:11:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Arnez X-Patchwork-Id: 26311 Received: (qmail 97114 invoked by alias); 14 Mar 2018 16:13:17 -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 96596 invoked by uid 89); 14 Mar 2018 16:13:16 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-24.7 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_LAZY_DOMAIN_SECURITY, RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.2 spammy= X-HELO: mx0a-001b2d01.pphosted.com Received: from mx0a-001b2d01.pphosted.com (HELO mx0a-001b2d01.pphosted.com) (148.163.156.1) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 14 Mar 2018 16:13:14 +0000 Received: from pps.filterd (m0098394.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.22/8.16.0.22) with SMTP id w2EGC0LM016906 for ; Wed, 14 Mar 2018 12:13:13 -0400 Received: from e06smtp11.uk.ibm.com (e06smtp11.uk.ibm.com [195.75.94.107]) by mx0a-001b2d01.pphosted.com with ESMTP id 2gq6nes874-1 (version=TLSv1.2 cipher=AES256-SHA256 bits=256 verify=NOT) for ; Wed, 14 Mar 2018 12:13:12 -0400 Received: from localhost by e06smtp11.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 14 Mar 2018 16:13:10 -0000 Received: from b06cxnps3074.portsmouth.uk.ibm.com (9.149.109.194) by e06smtp11.uk.ibm.com (192.168.101.141) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Wed, 14 Mar 2018 16:13:09 -0000 Received: from d06av24.portsmouth.uk.ibm.com (mk.ibm.com [9.149.105.60]) by b06cxnps3074.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id w2EGD88i37945550 for ; Wed, 14 Mar 2018 16:13:08 GMT Received: from d06av24.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 3B26042042 for ; Wed, 14 Mar 2018 16:05:23 +0000 (GMT) Received: from d06av24.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 1983F4204B for ; Wed, 14 Mar 2018 16:05:23 +0000 (GMT) Received: from oc1027705133.ibm.com (unknown [9.152.212.144]) by d06av24.portsmouth.uk.ibm.com (Postfix) with ESMTP for ; Wed, 14 Mar 2018 16:05:23 +0000 (GMT) From: Andreas Arnez To: gdb-patches@sourceware.org Subject: [PATCH 2/3] Testsuite: Rename "end()" to avoid libinproctrace C++ symbol clash Date: Wed, 14 Mar 2018 17:11:02 +0100 In-Reply-To: <1521043903-18837-1-git-send-email-arnez@linux.vnet.ibm.com> References: <1521043903-18837-1-git-send-email-arnez@linux.vnet.ibm.com> X-TM-AS-GCONF: 00 x-cbid: 18031416-0040-0000-0000-0000044071FC X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 18031416-0041-0000-0000-000020E3779C Message-Id: <1521043903-18837-3-git-send-email-arnez@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2018-03-14_08:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=1 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 impostorscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1709140000 definitions=main-1803140183 X-IsSubscribed: yes Some of GDB's trace test cases define a function end() and place a breakpoint there with "break end". However, when libinproctrace is linked to the binary, there are multiple methods named "end", such as std::string::end() from the C++ library or format_pieces::end() from common/format.h. GDB then creates multiple breakpoints instead of just a single one, and some FAILs result, such as these: FAIL: gdb.trace/trace-mt.exp: ftrace on: break end FAIL: gdb.trace/trace-mt.exp: ftrace off: break end This is fixed by renaming end() to my_end(). For consistency, where end() was paired with a previous begin(), the latter is renamed to my_begin() as well. gdb/testsuite/ChangeLog: * gdb.trace/trace-break.c (end): Rename to... (my_end): ...this. (main): Adjust call. * gdb.trace/trace-mt.c (end): Rename to... (my_end): ...this. (main): Adjust call. * gdb.trace/unavailable.cc (begin): Rename to... (my_begin): ...this. (end): Rename to... (my_end): ...this. (main): Adjust calls. * gdb.trace/trace-break.exp: Reflect function name change. * gdb.trace/trace-mt.exp: Likewise. * gdb.trace/unavailable.exp: Likewise. --- gdb/testsuite/gdb.trace/trace-break.c | 4 ++-- gdb/testsuite/gdb.trace/trace-break.exp | 12 ++++++------ gdb/testsuite/gdb.trace/trace-mt.c | 4 ++-- gdb/testsuite/gdb.trace/trace-mt.exp | 2 +- gdb/testsuite/gdb.trace/unavailable.cc | 8 ++++---- gdb/testsuite/gdb.trace/unavailable.exp | 20 ++++++++++---------- 6 files changed, 25 insertions(+), 25 deletions(-) diff --git a/gdb/testsuite/gdb.trace/trace-break.c b/gdb/testsuite/gdb.trace/trace-break.c index 6aa9d09214..3349066dcc 100644 --- a/gdb/testsuite/gdb.trace/trace-break.c +++ b/gdb/testsuite/gdb.trace/trace-break.c @@ -31,13 +31,13 @@ marker (void) } static void -end (void) +my_end (void) {} int main () { marker (); - end (); + my_end (); return 0; } diff --git a/gdb/testsuite/gdb.trace/trace-break.exp b/gdb/testsuite/gdb.trace/trace-break.exp index 539fcb5218..602b2e23ec 100644 --- a/gdb/testsuite/gdb.trace/trace-break.exp +++ b/gdb/testsuite/gdb.trace/trace-break.exp @@ -53,7 +53,7 @@ proc break_trace_same_addr_1 { trace_type option } \ gdb_test_no_output "set breakpoint always-inserted ${option}" - gdb_test "break end" "Breakpoint \[0-9\] at $hex: file.*" + gdb_test "break my_end" "Breakpoint \[0-9\] at $hex: file.*" gdb_test "break set_point" "Breakpoint \[0-9\] at $hex: file.*" gdb_test "${trace_type} set_point" "\(Fast t|T\)racepoint \[0-9\] at $hex: file.*" @@ -88,7 +88,7 @@ proc break_trace_same_addr_2 { trace_type1 trace_type2 option } \ gdb_test_no_output "set breakpoint always-inserted ${option}" - gdb_test "break end" "Breakpoint \[0-9\] at $hex: file.*" + gdb_test "break my_end" "Breakpoint \[0-9\] at $hex: file.*" gdb_test "${trace_type1} set_point" \ "\(Fast t|T\)racepoint \[0-9\] at $hex: file.*" \ @@ -127,7 +127,7 @@ proc break_trace_same_addr_3 { trace_type option } \ gdb_test_no_output "set breakpoint always-inserted ${option}" gdb_test "break marker" "Breakpoint \[0-9\] at $hex: file.*" - gdb_test "break end" "Breakpoint \[0-9\] at $hex: file.*" + gdb_test "break my_end" "Breakpoint \[0-9\] at $hex: file.*" gdb_test "break set_point" "Breakpoint \[0-9\] at $hex: file.*" gdb_test "${trace_type} set_point" "\(Fast t|T\)racepoint \[0-9\] at $hex: file.*" @@ -165,7 +165,7 @@ proc break_trace_same_addr_4 { trace_type option } \ gdb_test_no_output "set breakpoint always-inserted ${option}" gdb_test "break marker" "Breakpoint \[0-9\] at $hex: file.*" - gdb_test "break end" "Breakpoint \[0-9\] at $hex: file.*" + gdb_test "break my_end" "Breakpoint \[0-9\] at $hex: file.*" gdb_test "break set_point" "Breakpoint \[0-9\] at $hex: file.*" gdb_test "${trace_type} set_point" "\(Fast t|T\)racepoint \[0-9\] at $hex: file.*" @@ -208,7 +208,7 @@ proc break_trace_same_addr_5 { trace1 trace2 trace3 trace3_at_first_loc } \ } gdb_test "break marker" "Breakpoint \[0-9\] at $hex: file.*" - gdb_test "break end" "Breakpoint \[0-9\] at $hex: file.*" + gdb_test "break my_end" "Breakpoint \[0-9\] at $hex: file.*" gdb_test "${trace1} set_point" "\(Fast t|T\)racepoint \[0-9\] at $hex: file.*" \ "${trace1} set_point 1" @@ -282,7 +282,7 @@ proc break_trace_same_addr_6 { trace1 enable1 trace2 enable2 } \ } gdb_test "break marker" "Breakpoint \[0-9\] at $hex: file.*" - gdb_test "break end" "Breakpoint \[0-9\] at $hex: file.*" + gdb_test "break my_end" "Breakpoint \[0-9\] at $hex: file.*" gdb_test "continue" "Continuing\\.\[ \r\n\]+(Thread .* hit )?Breakpoint.*" \ "continue to marker" diff --git a/gdb/testsuite/gdb.trace/trace-mt.c b/gdb/testsuite/gdb.trace/trace-mt.c index 6f04ba7775..37d1ee0ea5 100644 --- a/gdb/testsuite/gdb.trace/trace-mt.c +++ b/gdb/testsuite/gdb.trace/trace-mt.c @@ -25,7 +25,7 @@ thread_function(void *arg) } static void -end (void) +my_end (void) {} int @@ -40,7 +40,7 @@ main (int argc, char *argv[], char *envp[]) for (i = 0; i < 2; i++) pthread_join (threads[i], NULL); - end (); + my_end (); return 0; } diff --git a/gdb/testsuite/gdb.trace/trace-mt.exp b/gdb/testsuite/gdb.trace/trace-mt.exp index f327406a13..bd89c9bec2 100644 --- a/gdb/testsuite/gdb.trace/trace-mt.exp +++ b/gdb/testsuite/gdb.trace/trace-mt.exp @@ -81,7 +81,7 @@ proc break_trace_same_addr { trace_type option } \ gdb_test_no_output "set breakpoint always-inserted ${option}" - gdb_test "break end" "Breakpoint \[0-9\] at $hex: file.*" + gdb_test "break my_end" "Breakpoint \[0-9\] at $hex: file.*" gdb_test "break set_point1" "Breakpoint \[0-9\] at $hex: file.*" gdb_test "${trace_type} set_point1" "\(Fast t|T\)racepoint \[0-9\] at $hex: file.*" diff --git a/gdb/testsuite/gdb.trace/unavailable.cc b/gdb/testsuite/gdb.trace/unavailable.cc index 56e5541259..aa4aeef65f 100644 --- a/gdb/testsuite/gdb.trace/unavailable.cc +++ b/gdb/testsuite/gdb.trace/unavailable.cc @@ -174,12 +174,12 @@ Virtual *virtualp = &virtual_partial; /* Test functions. */ static void -begin () /* called before anything else */ +my_begin () /* called before anything else */ { } static void -end () /* called after everything else */ +my_end () /* called after everything else */ { } @@ -325,7 +325,7 @@ main (int argc, char **argv, char **envp) test_struct mystruct; int myarray[4]; - begin (); + my_begin (); /* Assign collectable values to global variables. */ globalc = 71; globali = 72; @@ -395,6 +395,6 @@ main (int argc, char **argv, char **envp) g_structref.clear (); g_structref_p = NULL; - end (); + my_end (); return 0; } diff --git a/gdb/testsuite/gdb.trace/unavailable.exp b/gdb/testsuite/gdb.trace/unavailable.exp index 79aa8ef1b0..7e8fc8b303 100644 --- a/gdb/testsuite/gdb.trace/unavailable.exp +++ b/gdb/testsuite/gdb.trace/unavailable.exp @@ -61,21 +61,21 @@ proc prepare_for_trace_test {} { runto_main - gdb_test "break begin" ".*" "" - gdb_test "break end" ".*" "" + gdb_test "break my_begin" ".*" "" + gdb_test "break my_end" ".*" "" } proc run_trace_experiment { test_func } { global gdb_prompt gdb_test "continue" \ - ".*Breakpoint \[0-9\]+, begin .*" \ - "advance to begin" + ".*Breakpoint \[0-9\]+, my_begin .*" \ + "advance to my_begin" gdb_test_no_output "tstart" "start trace experiment" gdb_test "continue" \ - "Continuing.*Breakpoint \[0-9\]+, end.*" \ + "Continuing.*Breakpoint \[0-9\]+, my_end.*" \ "run trace experiment" gdb_test "tstop" \ "\[\r\n\]+" \ @@ -189,7 +189,7 @@ proc gdb_collect_args_test {} { gdb_collect_args_test_1 gdb_test "tfind none" \ - "#0 end .*" \ + "#0 my_end .*" \ "cease trace debugging" set tracefile [standard_output_file ${testfile}] @@ -273,7 +273,7 @@ proc gdb_collect_locals_test { func msg } { gdb_collect_locals_test_1 $func gdb_test "tfind none" \ - "#0 end .*" \ + "#0 my_end .*" \ "cease trace debugging" set tracefile [standard_output_file ${testfile}] @@ -357,7 +357,7 @@ proc gdb_unavailable_registers_test { } { gdb_unavailable_registers_test_1 - gdb_test "tfind none" "#0 end .*" "cease trace debugging" + gdb_test "tfind none" "#0 my_end .*" "cease trace debugging" set tracefile [standard_output_file ${testfile}] gdb_test "tsave ${tracefile}.registers.tfile" \ @@ -421,7 +421,7 @@ proc gdb_unavailable_floats { } { gdb_unavailable_floats_1 - gdb_test "tfind none" "#0 end .*" "cease trace debugging" + gdb_test "tfind none" "#0 my_end .*" "cease trace debugging" set tracefile [standard_output_file ${testfile}] gdb_test "tsave ${tracefile}.floats.tfile" \ @@ -688,7 +688,7 @@ proc gdb_collect_globals_test { } { gdb_collect_globals_test_1 gdb_test "tfind none" \ - "#0 end .*" \ + "#0 my_end .*" \ "cease trace debugging" set tracefile [standard_output_file ${testfile}]