From patchwork Sun Nov 20 23:36:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philippe Waroquiers X-Patchwork-Id: 60897 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 960653858C3A for ; Sun, 20 Nov 2022 23:36:49 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 960653858C3A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1668987409; bh=eCHEQuzi0AZ3tft7RGu3MdBDmb28sBPqZrt+a9N4P10=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=jTO4RVZ9znXXLu1jcEkE7PUzhsyRt1ao7yBj0O0cMjdHotH7E37AoK9EwHn4irqG3 bcnzMy+ZlQLrPLny04/woYuEPZVeQYqH+svHxbPV294sl2EUqCMvi4UFbmf2cvZP7U 5P1zvVz1m+9D+JwyR7tsBQ8SegP9tR+kA9WYTzdk= X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from mailsec118.isp.belgacom.be (mailsec118.isp.belgacom.be [195.238.20.114]) by sourceware.org (Postfix) with ESMTPS id 7D5A83858D33 for ; Sun, 20 Nov 2022 23:36:23 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 7D5A83858D33 X-ExtLoop: 1 X-IPAS-Result: A2DjBAC9uHpj/1uGgG1agRKuFotpgWoPAQEBAQEBAQEBCUQEAQGFBYUEJjgTAQIEAQEBAQMCAwEBAQEBAQMBAQYBAQEBAQEGBAGBG4UvRoI1IoN/NgFGKCCEBoMjtQIaAmWEcJpmgWeBQItOhXmBVUSECIRygQYOhXEEmDADCQMHBUlAAwsYDRYyChM3G1gOCR8cJQ0FBhIDIGwFBzoPKC9nEBscGweBDCooFQMEBAMCBhMDIgINKTEUBCkTDSsnbwkCAyFqAwMEKCwDCSEfBycmPAdWPwMCDyA4BgMJAwIiVXQvEhQFAwsVJQgFSwQIOQUGUxICChEDEg8sRQ5IPjkWBidCATEODhQDXksdgQEEgiYKnAwtYcUnNAeDa4FHBgyeYRoylxgDkXoBh16PVqMnhFGBeYF+bYM7URmdAIEvAgcLAQEDCYpiAQE IronPort-PHdr: A9a23:1nrF0RCw/PNHLC7qyidPUyQU+0MY04WdBeb1wqQuh78GSKm/5ZOqZ BWZua8xygKUFt2Eo7Ic0qyK6fumATRBqb+681k6OKRWUBEEjchE1ycBO+WiTXPBEfjxciYhF 95DXlI2t1uyMExSBdqsLwaK+i764jEdAAjwOhRoLerpBIHSk9631+ev8JHPfglEnjWwba19I RmsrQjctsYajZdgJ60szhfFvmZEd/5ZyG92K1+fhQrw6tu18JV+7ylepvUt+tJaX67nZao4V 7tYDDonM2Ax+sLmsATIQBWM6HUBTGgYiwJEDAfZ4h70WJfxqTb6ufFm2CaGJ832TKs7Viqk4 qx2VRLnkiYHNzo+8GHKlsx9ib9QrRy9qxBjxYPffYeYP+d8cKzAZ9MXXWpPUNhPWiJcDI2yb IwBAOUOM+tDs4XwpEEDoQekCAWwGO/izCJDiH/s3a091uQsCRvI3AwhH9IKsXTUtM31O7kPW u+11qbI1zLDb+pL2Tf89ofIaAshquyLULJoccrRyE0vFwLdjlWIt4PpJT2U2f4Xs2ic9upgS OOvhHA9qwFquTWv3cQsi4nPho0L1lDI7z52z5gsKNC+VUV0bsKqHoFKuCGGK4t5XNkiQ2dwt Ss017ALuJG2cDUKxponxxDSb/+Kf5WV7x79WuifLil1inx5dL+9iRu/7Emtx+LyWMe7zltGs CtInsTDu30R1hHe7NWMRPhl/kq5xDqDywTe5vtZLUwqlqfXMYMtz7A/m5YJtUnPAyn7k1jsg qCMbEUr4O2o5vziYrXhu5CTKZd5ihr7MqQygsy/Bvk4MhQWU2ib5+u80Lrj8FX8QLpXlPE2k q7ZsJXEKsgDp665BRFa0po75hqiEzur1M4UkWQZIF9GYh6LkobkNl7ULP38EPuzm1Gsny1qx /DCML3hGJLNLn3bnbf5fbZ96kpcyAsrzdBH+Z1YEL8AL+jpWk/2rdzYEx45PBKuw+b8E9h9z YAeWGKJAqCHLKPeq0SH6fw3L+mKf4AaoCz9JOQ95/7ykX85nkcQcbex0ZsNdH+4BuhmI1meY Xf0jdcODHwFshMmTOPwlF2NTT5TaGipX68n/TE7D5+mDZ3fSY+zjr2Oxj27EYNMamBBEFCMH m/kd5+YVPcUdCKSPshhnyQcVbihSo8h0RCutBfiy7V5NObV9DcXtYjk1Nhs+u3TlA899SZvD 8mGyGGNTGF1nmUWSD8qxqxwulJymR+/1v13j/YdDdVP7PNESS8hMoPGxOFlAsr/HAXbcYSnU lGjF+2mADUwVso8i+AHeUFkBtSvlAuLizKqArsUj6SGQoM96KXFwnn8Pd1V0HXX0qQ9yVMrF JgcfVa6j7JyolCAT7XClF+Uwv7CSA== IronPort-Data: A9a23:BqQbJKClbnfTFhVW/2Piw5YqxClBgxIJ4kV8jS/XYbTApGwk0jNUn DEeD2+OOKvbY2TyfY0kOtzjo0sAvcWGxtViOVdlrnsFo1CmCSbm6XV1Cm+qYkt+++WaFBoPA /02M4WGdoZtJpPljk/FGqD7qnVh3r2/SLP5CerVUgh8XgYMpB0J0HqPoMZkxN826TSFK1nV4 4mr+peHYAXNNwNcawr41YrS8HuDg9yv4Fv0jnRmDdhXsVnXkWUiDZ53Dcld+FOhH+G4tsbjL wry5OnRElHxpn/BOfv5+lrPSXDmd5aJVeS4ZtW6bID56vRKjnRaPq/Wr5PwY28P49mCt4gZJ NmgKfVcRC9xVpAgltjxXDFgSxp1HfNc9oTZf12TvuzJ9xLqcXnjlqAG4EEeZeX0+85yDSdO8 vkVQNwPRknb1qTvmuL9E7IwwJV6RCXoFNp3VnVI1THYCfc+WZ2FXKzQ4sZF3ToqnehVHufYa tZfYzcHgBHoOkYXZQdNVM1m9AuurkD0TjFl8AqynoM2vW73lTIqyeeqKOOAL7RmQu0QxC50v Fnu8GjzRwkTKNefxCGt6XWxnOTCgirhVcQVDrLQ3uZqgVmS3nQeTgIfT1yivPi0kFWWQNFOL UEIvCAjxZXe72TyFoi7Bkfo5iff4lhNArK8DtEH1e1E8YKMiy7xO4TOZmcphAAO3CP9edDmO pJlUT8k6fyDfYB5kU6gy4o= IronPort-HdrOrdr: A9a23:53rZP6iCur+WFqZOm+avaDWtb3BQXtIji2hC6mlwRA09TyX+rb HNoB17726WtN91YhodcL+7WZVoLUmxyXcX2+Qs1NWZLWzbUQKTRekJ0WKF+VPd8kbFltK1u5 0OT0A0YOeAaWRHsQ== X-IronPort-Anti-Spam-Filtered: true X-ProximusIPWarmup: true Received: from unknown (HELO md.home) ([109.128.134.91]) by relay.proximus.be with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Nov 2022 00:36:21 +0100 To: gdb-patches@sourceware.org Cc: Philippe Waroquiers Subject: [RFA] Fix step-over-syscall.exp matching regexp for $bpnum.$locno matching Date: Mon, 21 Nov 2022 00:36:14 +0100 Message-Id: <20221120233614.388361-1-philippe.waroquiers@skynet.be> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 X-Spam-Status: No, score=-12.7 required=5.0 tests=BAYES_00, 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 X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Philippe Waroquiers via Gdb-patches From: Philippe Waroquiers Reply-To: Philippe Waroquiers Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" 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.*" \ "continue to marker" } }