From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by sourceware.org (Postfix) with ESMTPS id 60C8E3858D35 for ; Sat, 15 Jul 2023 15:06:36 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 60C8E3858D35 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.de Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 672A41F896; Sat, 15 Jul 2023 15:06:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1689433595; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=wlpeeIoCIoMA0W2N/dBCmw7TLGspAvOruS7kbjv7KXs=; b=RrvhqAFDzHdNPRvIw08DTDKxXApsdp9cIGvSePO/v5mKrdU/hiJcYGb5kmVXxt4aHrU584 +cPdWEUMvERXu5j/s/uMxjQkQ6DaHrJ6ousiIgKTzGG0C9cbK4PeY5k/s2PhAxoyOCPnUx hmuZwiNNUYyJVF3qC8eR1w6wVASZnH8= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1689433595; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=wlpeeIoCIoMA0W2N/dBCmw7TLGspAvOruS7kbjv7KXs=; b=u03DLGrwm8drKSD1aGbTNTQrjzfhUu83nMJDHuZcrqrj6AMoBjeAHVokQiL5yVgUjXcPkK 6Us8potANz+DEAAw== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 24D18138F3; Sat, 15 Jul 2023 15:06:35 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id HIX5B/u1smRMOQAAMHmgww (envelope-from ); Sat, 15 Jul 2023 15:06:35 +0000 Content-Type: multipart/mixed; boundary="------------q9nK5El2Ds6ACpEedYjQyKkr" Message-ID: <29b8fd9c-fcd6-9055-d2d4-99cf2b2c7496@suse.de> Date: Sat, 15 Jul 2023 17:06:35 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.12.0 Subject: Re: [pushed] [gdb/testsuite] Fix gdb.dwarf2/forward-spec.exp with read1 Content-Language: en-US To: Andreas Schwab , Tom de Vries via Gdb-patches Cc: Tom Tromey References: <20230715081104.2452-1-tdevries@suse.de> <87v8elef40.fsf@linux-m68k.org> From: Tom de Vries In-Reply-To: <87v8elef40.fsf@linux-m68k.org> X-Spam-Status: No, score=-12.0 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,KAM_NUMSUBJECT,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,TXREP,T_SCC_BODY_TEXT_LINE 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: This is a multi-part message in MIME format. --------------q9nK5El2Ds6ACpEedYjQyKkr Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 7/15/23 10:46, Andreas Schwab wrote: > On Jul 15 2023, Tom de Vries via Gdb-patches wrote: > >> diff --git a/gdb/testsuite/gdb.dwarf2/forward-spec.exp b/gdb/testsuite/gdb.dwarf2/forward-spec.exp >> index ac7d16b09b8..f4512cf9b8c 100644 >> --- a/gdb/testsuite/gdb.dwarf2/forward-spec.exp >> +++ b/gdb/testsuite/gdb.dwarf2/forward-spec.exp >> @@ -74,7 +74,7 @@ if {[prepare_for_testing "failed to prepare" ${testfile} \ >> >> set in_v 0 >> gdb_test_multiple "maint print objfiles" "v has a parent" { >> - -re "^ *\\\[\[0-9\]\\\] *..cooked_index_entry\[^\r\n\]*" { >> + -re "^ *\\\[\[0-9\]\\\] *\\(\\(cooked_index_entry\[^\r\n\]*" { > > A match that ends with an empty element doesn't make much sense. I > guess this should rather be > > -re "^ *\\\[\[0-9\]\\\] *..cooked_index_entry\[^\r\n\]*\[\r\n\]" { > > to avoid matching an incomplete line. > >> set in_v 0 >> exp_continue >> } >> @@ -82,7 +82,7 @@ gdb_test_multiple "maint print objfiles" "v has a parent" { >> set in_v 1 >> exp_continue >> } >> - -re "^ *parent: *..cooked_index_entry .. (0|$hex)." { >> + -re "^ *parent: *\\(\\(cooked_index_entry \\*\\) (0|$hex)\\)" { > > I think this just needs to be anchored on EOL as well. > Agreed, anchoring can be improved, but I'd rather use the style that can be used in combination with -wrap, which only lookahead-matches the EOL, but doesn't consume it. This plays well with "-wrap", and all the implicit patterns added by gdb_test_multiple. Thanks, - Tom --------------q9nK5El2Ds6ACpEedYjQyKkr Content-Type: text/x-patch; charset=UTF-8; name="0001-gdb-testsuite-Improve-matching-in-gdb.dwarf2-forward.patch" Content-Disposition: attachment; filename*0="0001-gdb-testsuite-Improve-matching-in-gdb.dwarf2-forward.pa"; filename*1="tch" Content-Transfer-Encoding: base64 RnJvbSBhM2Y1MGRjYjliN2RjYTM5NTQ2NzgxZWJmMGVlNmIwMDYxZjEwOThlIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBUb20gZGUgVnJpZXMgPHRkZXZyaWVzQHN1c2UuZGU+ CkRhdGU6IFNhdCwgMTUgSnVsIDIwMjMgMTY6NTI6MDUgKzAyMDAKU3ViamVjdDogW1BBVENI XSBbZ2RiL3Rlc3RzdWl0ZV0gSW1wcm92ZSBtYXRjaGluZyBpbgogZ2RiLmR3YXJmMi9mb3J3 YXJkLXNwZWMuZXhwCgpJbXByb3ZlIG1hdGNoaW5nIGluIHRlc3QtY2FzZSBpbiBnZGIuZHdh cmYyL2ZvcndhcmQtc3BlYy5leHA6Ci0gdXNlIC13cmFwIHJhdGhlciB0aGFuIGFuIGV4cGxp Y2l0ICIkZ2RiX3Byb21wdCAiICwgd2hpY2ggbWlzc2VzCiAgdGhlICQgYW5jaG9yIGF0IHRo ZSBlbmQKLSB1c2UgbGluZS1ieS1saW5lIG1hdGNoaW5nLCBjb25zdW1pbmcgdGhlIHN0YXJ0 LW9mLWxpbmUgXHJcbiwgYW5kCiAgbG9va2FoZWFkLW1hdGNoaW5nIHRoZSBlbmQtb2YtbGlu ZSBcclxuCi0gYWx3YXlzIHByb2R1Y2UgYSBwYXNzL2ZhaWwgYnkgdXNpbmcgYSBnZGJfYXNz ZXJ0IGluIHRoZSAtd3JhcCBjbGF1c2UKClRlc3RlZCBvbiB4ODZfNjQtbGludXguCi0tLQog Z2RiL3Rlc3RzdWl0ZS9nZGIuZHdhcmYyL2ZvcndhcmQtc3BlYy5leHAgfCAyNiArKysrKysr KysrKy0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDEzIGluc2VydGlvbnMoKyksIDEz IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2dkYi90ZXN0c3VpdGUvZ2RiLmR3YXJmMi9m b3J3YXJkLXNwZWMuZXhwIGIvZ2RiL3Rlc3RzdWl0ZS9nZGIuZHdhcmYyL2ZvcndhcmQtc3Bl Yy5leHAKaW5kZXggZjQ1MTJjZjliOGMuLmUyNTJjYmQ1ODkwIDEwMDY0NAotLS0gYS9nZGIv dGVzdHN1aXRlL2dkYi5kd2FyZjIvZm9yd2FyZC1zcGVjLmV4cAorKysgYi9nZGIvdGVzdHN1 aXRlL2dkYi5kd2FyZjIvZm9yd2FyZC1zcGVjLmV4cApAQCAtNzIsMzEgKzcyLDMxIEBAIGlm IHtbcHJlcGFyZV9mb3JfdGVzdGluZyAiZmFpbGVkIHRvIHByZXBhcmUiICR7dGVzdGZpbGV9 IFwKICAgICByZXR1cm4gLTEKIH0KIAorc2V0IG9rIDAKIHNldCBpbl92IDAKLWdkYl90ZXN0 X211bHRpcGxlICJtYWludCBwcmludCBvYmpmaWxlcyIgInYgaGFzIGEgcGFyZW50IiB7Ci0g ICAgLXJlICJeICpcXFxbXFswLTlcXVxcXF0gKlxcKFxcKGNvb2tlZF9pbmRleF9lbnRyeVxb XlxyXG5cXSoiIHsKK3NldCBjbWQgIm1haW50IHByaW50IG9iamZpbGVzIgorZ2RiX3Rlc3Rf bXVsdGlwbGUgJGNtZCAidiBoYXMgYSBwYXJlbnQiIHsKKyAgICAtcmUgIl4ke2NtZH0oPz1c clxuKSIgeworCWV4cF9jb250aW51ZQorICAgIH0KKyAgICAtcmUgIl5cclxuICpcXFxbJGRl Y2ltYWxcXFxdICpcXChcXChjb29rZWRfaW5kZXhfZW50cnlcW15cclxuXF0qKD89XHJcbiki IHsKIAlzZXQgaW5fdiAwCiAJZXhwX2NvbnRpbnVlCiAgICAgfQotICAgIC1yZSAiXiAqbmFt ZTogKnZcW1xyXG5cXSoiIHsKKyAgICAtcmUgIl5cclxuICpuYW1lOiAqdig/PVxyXG4pIiB7 CiAJc2V0IGluX3YgMQogCWV4cF9jb250aW51ZQogICAgIH0KLSAgICAtcmUgIl4gKnBhcmVu dDogKlxcKFxcKGNvb2tlZF9pbmRleF9lbnRyeSBcXCpcXCkgKDB8JGhleClcXCkiIHsKKyAg ICAtcmUgIl5cclxuICpwYXJlbnQ6ICpcXChcXChjb29rZWRfaW5kZXhfZW50cnkgXFwqXFwp ICRoZXhcXClcW15cclxuXF0qKD89XHJcbikiIHsKIAlpZiB7JGluX3Z9IHsKLQkgICAgaWYg eyRleHBlY3Rfb3V0KDEsc3RyaW5nKSA9PSAiMCJ9IHsKLQkJZmFpbCAkZ2RiX3Rlc3RfbmFt ZQotCSAgICB9IGVsc2UgewotCQlwYXNzICRnZGJfdGVzdF9uYW1lCi0JICAgIH0KLQkgICAg c2V0IGluX3YgMAorCSAgICBzZXQgb2sgMQogCX0KIAlleHBfY29udGludWUKICAgICB9Ci0g ICAgLXJlICJeXFteXHJcblxdKlxbXHJcblxdKyIgeworICAgIC1yZSAiXlxyXG5cW15cclxu XF0qKD89XHJcbikiIHsKIAlleHBfY29udGludWUKICAgICB9Ci0gICAgLXJlICIkZ2RiX3By b21wdCAiIHsKLQkjIERvbmUuCisgICAgLXJlIC13cmFwICIiIHsKKwlnZGJfYXNzZXJ0ICRv ayAkZ2RiX3Rlc3RfbmFtZQogICAgIH0KIH0KCmJhc2UtY29tbWl0OiA2YzFlODRmNWM2ZjM2 MjYzOTk4ZWYxOTM0YmYzMTMyYzhjZWJlNzVlCi0tIAoyLjM1LjMKCg== --------------q9nK5El2Ds6ACpEedYjQyKkr--