From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mailsec213.isp.belgacom.be (mailsec213.isp.belgacom.be [195.238.22.109]) by sourceware.org (Postfix) with ESMTPS id AFC4E384F495 for ; Mon, 21 Nov 2022 20:15:08 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org AFC4E384F495 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=skynet.be Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=skynet.be DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=skynet.be; i=@skynet.be; q=dns/txt; s=rmail; t=1669061709; x=1700597709; h=message-id:subject:from:to:date:in-reply-to:references: mime-version:content-transfer-encoding; bh=F1fS1J/fD6JkHt5zSlpJpo/6JxrDZ8oQTzBhLCziqGA=; b=djvjUfF13QVS3mIgmhzD5jY2VUOsYGPfkkDVSQYZVSBE3NZlicgF4hyx QPsRQECwU9STynStNIMV9PaC9JTsB66+Cdg53yreo5duRchOdZAaslMai h3Qy/TG31GPthCF12tEm3kAt61aUuJi7b/lz3ZqBrK4QRDXqWD56PDR71 0=; X-ExtLoop: 1 X-IPAS-Result: =?us-ascii?q?A2CtAQCz23tj/1uGgG0NTYEJCYZPhE6RHZ1FgWoPAQEBA?= =?us-ascii?q?QEBAQEBCUQEAQGFBQKFASY4EwECBAEBAQEDAgMBAQEBAQEDAQEGAQEBAQEBB?= =?us-ascii?q?gQBgRuFL4J7IoN9AQEBAyMPAVYJAg4KAgIRFQICVwYBEp4Omx16gTKBAYRxm?= =?us-ascii?q?mWBZ4EULIkAg2CEMDeBVUSECDc+g32BBoMYgmcEl3QcNwMZKx1AAwttCkobW?= =?us-ascii?q?A4JHxwOFw0FBhIDIGwFCjcPKC9nEBscGweBDCooFQMEBAMCBhMDIAINKTEUB?= =?us-ascii?q?CkTDSsnbwkCAyJlBQMDBCgsAwkhHwcWESQ8B1Y7BAMCDyA4BgMJAwIkVnUuE?= =?us-ascii?q?RUFAwsVJQgFSwQIOQUGUhICChEDEg8GJkYOSD45FgYndA4OFANegWkENYFxC?= =?us-ascii?q?pxKLWELgh8Vwmg0B4NrgUcGDJ57MqkWh16PViCnWIF5gX5tgzpSKJxxdDsCB?= =?us-ascii?q?wEKAQEDCYpiAQE?= IronPort-PHdr: A9a23:2mYlPxQkgUka0/EFJKdveOQBntpsosyYAWYlg6HPa5pwe6iut67vI FbYra00ygOTAcOGtbkd0LCe8/i5HzBautDZ6DFKWacPfidNsd8RkQ0kDZzNImzAB9muURYHG t9fXkRu5XCxPBsdMs//Y1rPvi/6tmZKSV3wOgVvO+v6BJPZgdip2OCu4Z3TZBhDiCagbb9oI xi6swrcutMWjIZjJao91xXErmVVcOhS2W9kOEifkhni6sq+5pJv7zhct/c8/MNcTKv2eLg1Q 6ZFBzo8KWA148PrtRjHTQSR43YXT3sbnBlVDQXb9R/2Rpj+vDf0uep7wymaINb5TasoVjS47 qdkUwHnhSEaPDMk6m7Xi8hwjKVGoBK9ohF03oDZbJ2JOPd4Y6jQe84RS2hcUcZLTyFPAZ6yY YsRAeQPP+lYoZXyqFUBohWxHgSsGODixyVUinPqx6A30eIsGhzG0gw6GNIOtWzZos/1NKcTV eC1zbHIzS3dYPhL2Tjy8pLIchc4ofGRXLJ/b9DRyVIyHA7CllWQqY3lPzeU1uQVq2iU8fBsV Oy1hG49rAFxuyWvxsYyhYnTnYIY0UvE9SZ5wYYzO9K4VFR3bsW6H5ZJsSyRKoR5TN84TW5yp CY61qMJuYS9fCUSyZkqxxDRZfOZf4WK7R/vSvqdLzh6iX9leL+zmgi//VWix+DiS8W4zktGo zRFn9TQqn0A1hLe5taJR/dj+kqtxTCC3B3Q5OFcOU04iLbXJpo7zrItiJYesl7PEjL4lUj5l qObclgo9+614Or9eLrmvIWTN4pshwH7NaQhh9KwDPwjMggLQ2ib4eO81KD//UHhQLVFkPk2k q7BvZ/eOMgWorC1DxVI3osi6BuzFSqq3M4FkXQDKl1JYBOHj473NFHSOP30EOuzjlC2nDt22 fzLPaftDojDI3XMirvseatx51ZZyAUpzNBf45xUCqsGIPL2QkLxrNzYDh49Mwy12+bnEMty2 pkQWG2VGK+ZN7rSsUKJ5u0xOemMf5QYuC3+K/kl4f7hk2M5lUUGcqa3xZcXbmu3Eex8I0qFe XrsnssBEWASswYgVODqkkGNUSZPZ3auWKIx/io7CIOjDYjZXICtg6eM3Dy6Hp1TfG9GEFOMH W30eIqeQ/sMcj6dItd9kjwYUrisU4Ah2gy1uwPj07poNPbU9TEYtZ39z9h4/PbTlRYv9TxuE 8uSzW+MQHtunmwWXTM227p/oUMugmuEhJN5hvteXfla/fhJU09uLp/ZxvZ5I8vzXwvbfZGCQ QDiCtqqC3QpR846w9IVS116Bs+pgw/KxSfsBKUaxJKRA5lhyqLd23npP8s19H/c07A8jlQ8W YMbLW2ngq9n7wWVGIfTlFyElquwbowH3z/L+XvFx2fY7xIQaxJ5TaiQBSNXXUDRt9msviv/ IronPort-Data: A9a23:wIJJAaMJ3PEbjsvvrR3BlsFynXyQoLVcMsEvi/4bfWQNrUok1TxSn DEXD26BPKuLZDb0Lowka4Ti9x5VsMWDnIBqTHM5pCpnJ55oRWopJjg4wmPYZX76whjrFRo/h ykmQoCcappyFxcwnz/1WpD5t35wyKqUcbT1De/AK0hZSBRtIMsboUsLd9UR38g537BVPyvX4 Ymo+pSFYQf/s9JJGjt8B5yr+UsHUMva5WtwUmwWPZhjoFLYnn8JO5MTTYnZw6zQG9Q88kaSH o4v/Znhlo/r105F5uCNzt4XRnY3rov6ZmBivJb5t5+K2XCurgRqukoy2WF1hU1/011llPgpo DlBWADZpQoBZsXxdOohvxZwPi5cBvEXyYD9KlOSoc+MygqBaWfP+qA7ZK02FdVwFudfMjgfr 7pBdmBLN1ba1tfeLLCTE7E9wJ15fI+yZ99Z6ygIITLxVJ7KRbjbQ6TO5MdA0XEvj9pJBOvfa tACQSFsfRLNf1tFNz/7Dbplxrrz3SOuLFW0rnqfnrcp7WTZ1TZO1bfGbdGMcPXNeNRsyxPwS mXuuj6R7gshHMeezDOf8Vq3h+rGhyC9U4t6PLK0/LtyiUGYxmEIIAYRSEGwrOawkEP4XMhQQ 3H44QJ/9O5rrxDuF4OtGkTg8TiNsgUYHtZBFas78xnLwKfQ7A+SAW1CRDMphMEaifLajAcCj jeh9+4FzxQ22FFJYRpxPYt4Yd9/1eb54IPCieI5odM53uTe IronPort-HdrOrdr: A9a23:/OrFkapEIJQmt8SwslJtnMoaV5o2eYIsimQD101hICG9Ffbo8v xG/c5rtyMc7Qx6ZJhOo7y90cW7Lk80lqQFgrX5X43CYOCOggLBR+xfBODZowEIdReRytJg X-IronPort-Anti-Spam-Filtered: true Received: from 91.134-128-109.adsl-dyn.isp.belgacom.be (HELO [192.168.1.19]) ([109.128.134.91]) by relay.proximus.be with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Nov 2022 21:15:05 +0100 Message-ID: Subject: Re: [RFA] Fix step-over-syscall.exp matching regexp for $bpnum.$locno matching From: Philippe Waroquiers To: Simon Marchi , gdb-patches@sourceware.org Date: Mon, 21 Nov 2022 21:15:06 +0100 In-Reply-To: References: <20221120233614.388361-1-philippe.waroquiers@skynet.be> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.38.3-1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-10.6 required=5.0 tests=BAYES_00,BODY_8BITS,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_DNSWL_LOW,SPF_HELO_NONE,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: On Mon, 2022-11-21 at 07:58 -0500, Simon Marchi wrote: > > On 11/20/22 18:36, Philippe Waroquiers via Gdb-patches wrote: > > step-over-syscall.exp has some specific tests for gdbserver. > > The regexp matching breakpoint hit must take the added locno into account. > > > > Test re-run in 3 modes (normal, native-gdbserver and native-extended-gdbserver). > > --- > >  gdb/testsuite/gdb.base/step-over-syscall.exp | 5 +++-- > >  1 file changed, 3 insertions(+), 2 deletions(-) > > > > diff --git a/gdb/testsuite/gdb.base/step-over-syscall.exp b/gdb/testsuite/gdb.base/step-over-syscall.exp > > index 788f6e3f5d0..3160900ad83 100644 > > --- a/gdb/testsuite/gdb.base/step-over-syscall.exp > > +++ b/gdb/testsuite/gdb.base/step-over-syscall.exp > > @@ -321,6 +321,7 @@ proc step_over_syscall { syscall } { > >  # "on" or "off". > >   > > > >  proc break_cond_on_syscall { syscall follow_fork detach_on_fork } { > > + global bkptno_numopt_re > >      with_test_prefix "break cond on target : $syscall" { > >   set testfile "step-over-$syscall" > >   > > > > @@ -368,12 +369,12 @@ proc break_cond_on_syscall { syscall follow_fork detach_on_fork } { > >   if { $detach_on_fork == "off" } { > >   gdb_test "inferior 1" > >   gdb_test "break marker" "Breakpoint.*at.*" > > - gdb_test "continue" "Continuing\\..*Breakpoint \[0-9\]+, marker \\(\\) at.*" \ > > + gdb_test "continue" "Continuing\\..*Breakpoint $bkptno_numopt_re, marker \\(\\) at.*" \ > >   "continue to marker" > >   } > >   } else { > >   gdb_test "break marker" "Breakpoint.*at.* file .*${testfile}.c, line.*" > > - gdb_test "continue" "Continuing\\..*Breakpoint \[0-9\]+, marker \\(\\) at.*" \ > > + gdb_test "continue" "Continuing\\..*Breakpoint $bkptno_numopt_re, marker \\(\\) at.*" \ > > I would suggest using the $::bkptno_numopt_re form (and removing the > global declaration), that makes it clear on use that this is a global > variable. With that fixed: > > Approved-By: Simon Marchi > > Simon Pushed after implementing the suggestion above. Thanks for the review. Philippe