From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id 6DEC03858D28 for ; Mon, 11 Dec 2023 16:44:58 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 6DEC03858D28 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 6DEC03858D28 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1702313100; cv=none; b=tLWcoYicRBnI6gzOC+zY9axgumFtjMNvgkFxDmPpgk7HQghVd6z3nKGhDlW57GOZyQzmYjQvXXWtSWmFgxvd+6rMOhZCcah3TYIqR2yu29nkb+0zlj9a2G94W1w2Val19cAsL0T7ulaJof7T0/MnOxWWgMYaQY8eSP2YpwNAQVo= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1702313100; c=relaxed/simple; bh=V+Ay55b8yaacGxplLLOHDptTmFheUHo8aqjiwa3RYdo=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=kyGWSKCNzXKh6ZIVN81m3AAg/EYaJu1yfCD1bjLNxIzz8JbavjnrP2i10FATuHAoeLfOTce2UfSqSDUVdr6yprbKRo/8WPw5hrmWFtUP2byRsJA1TSCbzcQdbO9XaQ9SNIpczaSlNA5fZaoyEwKpHcV6iULmSGneX2s5+9x3paw= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1702313098; h=from:from:reply-to:subject:subject: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=CIsZqVGuxIoRccEM7uj/ELTcBDFkxlIWZGtXQKzfPqQ=; b=VCgDnYPGL8RXax6SE1dHs0WrK7fRfvcbZWiEfMgU3Agn/5JrYf2o/9LdASl7lK4ZB4zgH3 AvZAhfel6k+NpOwO3Ti4WQ+bqeuZJETIacF7JKuANR2o/BSi/UZaXiqiC/cozsEWChmgr7 SO7jJOowDO66hXJePFxteLNCUYZW4qM= Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-646--1oiBetPPn-sidyY7cyYxw-1; Mon, 11 Dec 2023 11:44:56 -0500 X-MC-Unique: -1oiBetPPn-sidyY7cyYxw-1 Received: by mail-wr1-f70.google.com with SMTP id ffacd0b85a97d-33608b00a04so2500690f8f.1 for ; Mon, 11 Dec 2023 08:44:56 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702313095; x=1702917895; h=mime-version:message-id:date:references:in-reply-to:subject:cc:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=CIsZqVGuxIoRccEM7uj/ELTcBDFkxlIWZGtXQKzfPqQ=; b=piqxgBAU8TJ6O4aWCEczObiSjeY3XACPF05UMY0TPFLaLsB9RJi6nILlLcBuOA6Zas k5ouz1ALsbIGKLkMYRXhXHmbVvp0m5TB6zQXY8E7eAbj/nYS78ehVoO75hkDocztL7+L RXCNQ/DOHS2lUsQZsZ+omfodVjoPcd2EcYL2viwj4Uh8ZpZrohRcngwWy0h9+Rbvg5r2 GByYhF4CnUyANcVofmU2fhJUHBKTZciH1OgRq7mBYk3IMBRxJvXcD+rXT71c7BYHQwlP QyKt2E6Kq884kWNmzt+iTyzanhkIrKP5H+wMAc0aPaFRZhqY13DVrSAiBE/9cAwCT8SN Mgvw== X-Gm-Message-State: AOJu0YxY/NTwR1p6ODlgTA1Jq1fj01yZ9Wwc6iuArpEHoqxOkVSO88Iq 1xPcsuIZbH30rT+YkFOunew1e9KbbLI41BbQ41/nwB1f371o2p+045VF2qdAlMDWIq17nGU1rH7 Ds8dotnIGQ3xPIZM2EuICHoDrYwX4ZQ== X-Received: by 2002:a5d:550b:0:b0:333:2fd2:8168 with SMTP id b11-20020a5d550b000000b003332fd28168mr2410053wrv.133.1702313095312; Mon, 11 Dec 2023 08:44:55 -0800 (PST) X-Google-Smtp-Source: AGHT+IGxYRlo9ZlWAwJmro32Rlj+VHFwYS1huJcbYkvDiCKZYUsERCLXSn7TVi368ZcjifMvvit1mQ== X-Received: by 2002:a5d:550b:0:b0:333:2fd2:8168 with SMTP id b11-20020a5d550b000000b003332fd28168mr2410048wrv.133.1702313094967; Mon, 11 Dec 2023 08:44:54 -0800 (PST) Received: from localhost (105.226.159.143.dyn.plus.net. [143.159.226.105]) by smtp.gmail.com with ESMTPSA id o3-20020a5d6843000000b0033335333d88sm8964973wrw.43.2023.12.11.08.44.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Dec 2023 08:44:54 -0800 (PST) From: Andrew Burgess To: Tom de Vries , Tom Tromey Cc: gdb-patches@sourceware.org Subject: Re: [PATCH 2/2] gdb/testsuite: tighten up some end-of-line patterns In-Reply-To: References: <90f05fc11d1bf8fc39af46ac057a48e1327174e2.1701280438.git.aburgess@redhat.com> <878r6fcaf0.fsf@tromey.com> <13fad4ae-4d29-4819-b82e-5fee72b402ba@suse.de> <87h6kog5b8.fsf@redhat.com> <20d8fce5-d190-4f83-9a6d-be47dd4a2738@suse.de> Date: Mon, 11 Dec 2023 16:44:53 +0000 Message-ID: <87bkawg03e.fsf@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain X-Spam-Status: No, score=-11.7 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE,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: Tom de Vries writes: > On 12/11/23 15:55, Tom de Vries wrote: >> Ok, I'll fix these then using this approach. > > Pushed as attached. Thanks for fixing this. Andrew > > Thanks, > - Tom > From 6a48bc988b57f94e2accc3899152a7b0c4946ada Mon Sep 17 00:00:00 2001 > From: Tom de Vries > Date: Mon, 11 Dec 2023 16:18:23 +0100 > Subject: [pushed] [gdb/testsuite] Fix $eol regexp usage in some test-cases > > Commit cff71358132 ("gdb/testsuite: tighten up some end-of-line patterns") replaced: > ... > set eol "\[\r\n\]+" > ... > with the more strict: > ... > set eol "\r\n" > ... > in a few test-cases, but didn't update all uses of eol accordingly. > > Fix this in three gdb.ada test-cases. > > Tested on x86_64-linux. > > Approved-By: Andrew Burgess > --- > gdb/testsuite/gdb.ada/catch_assert_if.exp | 2 +- > gdb/testsuite/gdb.ada/catch_ex.exp | 12 ++++++------ > gdb/testsuite/gdb.ada/excep_handle.exp | 12 ++++++------ > 3 files changed, 13 insertions(+), 13 deletions(-) > > diff --git a/gdb/testsuite/gdb.ada/catch_assert_if.exp b/gdb/testsuite/gdb.ada/catch_assert_if.exp > index 9b094d88dc8..3071c4a5e06 100644 > --- a/gdb/testsuite/gdb.ada/catch_assert_if.exp > +++ b/gdb/testsuite/gdb.ada/catch_assert_if.exp > @@ -52,7 +52,7 @@ set bp_location [gdb_get_line_number "STOP" ${testdir}/bla.adb] > set catchpoint_msg \ > "Catchpoint $decimal, failed assertion at $hex in bla \\\(\\\).*at .*bla.adb:$bp_location" > gdb_test "continue" \ > - "Continuing\.$eol$catchpoint_msg$eol.*STOP" \ > + "Continuing\.$eol$eol$catchpoint_msg$eol.*STOP" \ > "continuing to expected failed assertion" > > gdb_test "continue" \ > diff --git a/gdb/testsuite/gdb.ada/catch_ex.exp b/gdb/testsuite/gdb.ada/catch_ex.exp > index 22175d83c07..19f743db7a6 100644 > --- a/gdb/testsuite/gdb.ada/catch_ex.exp > +++ b/gdb/testsuite/gdb.ada/catch_ex.exp > @@ -55,13 +55,13 @@ gdb_test "info break" \ > set catchpoint_msg \ > "Catchpoint $any_nb, CONSTRAINT_ERROR (\\\(ignore C_E\\\) )?at $any_addr in foo \\\(\\\).*at .*foo.adb:$any_nb" > gdb_test "continue" \ > - "Continuing\.$eol$catchpoint_msg$eol.*SPOT1" \ > + "Continuing\.$eol$eol$catchpoint_msg$eol.*SPOT1" \ > "continuing to first exception" > > set catchpoint_msg \ > "Catchpoint $any_nb, PROGRAM_ERROR (\\\(foo\\.adb:$decimal explicit raise\\\) )?at $any_addr in foo \\\(\\\).*at .*foo.adb:$any_nb" > gdb_test "continue" \ > - "Continuing\.$eol$catchpoint_msg$eol.*SPOT2" \ > + "Continuing\.$eol$eol$catchpoint_msg$eol.*SPOT2" \ > "continuing to second exception" > > ################################################ > @@ -108,19 +108,19 @@ gdb_test "info break" \ > set catchpoint_msg \ > "Catchpoint $any_nb, PROGRAM_ERROR (\\\(foo.adb:$decimal explicit raise\\\) )?at $any_addr in foo \\\(\\\).*at .*foo.adb:$any_nb" > gdb_test "continue" \ > - "Continuing\.$eol$catchpoint_msg$eol.*SPOT2" \ > + "Continuing\.$eol$eol$catchpoint_msg$eol.*SPOT2" \ > "continuing to Program_Error exception" > > set catchpoint_msg \ > "Catchpoint $any_nb, failed assertion at $any_addr in foo \\\(\\\).*at .*foo.adb:$any_nb" > gdb_test "continue" \ > - "Continuing\.$eol$catchpoint_msg$eol.*SPOT3" \ > + "Continuing\.$eol$eol$catchpoint_msg$eol.*SPOT3" \ > "continuing to failed assertion" > > set catchpoint_msg \ > "Catchpoint $any_nb, unhandled CONSTRAINT_ERROR at $any_addr in foo \\\(\\\).*at .*foo.adb:$any_nb" > gdb_test "continue" \ > - "Continuing\.$eol$catchpoint_msg$eol.*SPOT4" \ > + "Continuing\.$eol$eol$catchpoint_msg$eol.*SPOT4" \ > "continuing to unhandled exception" > > gdb_test "continue" \ > @@ -148,7 +148,7 @@ gdb_test "tcatch exception" \ > set temp_catchpoint_msg \ > "Temporary catchpoint $any_nb, CONSTRAINT_ERROR (\\\(.*\\\) )?at $any_addr in foo \\\(\\\).*at .*foo.adb:$any_nb" > gdb_test "continue" \ > - "Continuing\.$eol$temp_catchpoint_msg$eol.*SPOT1" \ > + "Continuing\.$eol$eol$temp_catchpoint_msg$eol.*SPOT1" \ > "continuing to temporary catchpoint" > > with_test_prefix "temporary catchpoint" { > diff --git a/gdb/testsuite/gdb.ada/excep_handle.exp b/gdb/testsuite/gdb.ada/excep_handle.exp > index 590c7fccdec..f1ce24a1682 100644 > --- a/gdb/testsuite/gdb.ada/excep_handle.exp > +++ b/gdb/testsuite/gdb.ada/excep_handle.exp > @@ -55,7 +55,7 @@ gdb_test "catch handlers" \ > # Continue. The program should stop at first exception handling. > > gdb_test "continue" \ > - "Continuing\.$eol$catchpoint_constraint_error_msg" \ > + "Continuing\.$eol$eol$catchpoint_constraint_error_msg" \ > "continuing to first Constraint_Error exception handlers" > > # Resume the program's exception. > @@ -66,7 +66,7 @@ gdb_test "continue" \ > # the next exception being raised. > > gdb_test "continue" \ > - "Continuing\.$eol$catchpoint_storage_error_msg" \ > + "Continuing\.$eol$eol$catchpoint_storage_error_msg" \ > "continuing and stopping in Storage_Error exception handlers" > > gdb_test_no_output "delete 2" \ > @@ -85,7 +85,7 @@ gdb_test "catch handlers Program_Error" \ > # Continue, we should not stop at ABORT_SIGNAL but at Program_Error one. > > gdb_test "continue" \ > - "Continuing\.$eol$catchpoint_program_error_msg" \ > + "Continuing\.$eol$eol$catchpoint_program_error_msg" \ > "continuing without stopping to Program_Error exception handlers" > > gdb_test_no_output \ > @@ -101,7 +101,7 @@ gdb_test "catch handlers Storage_Error" \ > # Continue, we should stop at Storage_Error handlers. > > gdb_test "continue" \ > - "Continuing\.$eol$catchpoint_storage_error_msg" \ > + "Continuing\.$eol$eol$catchpoint_storage_error_msg" \ > "continuing without stopping to Storage_Error exception handlers" > > gdb_test_no_output \ > @@ -126,7 +126,7 @@ gdb_test "info breakpoint" "stop only if Global_Var = 2" \ > # Continue, we should not stop at ABORT_SIGNAL but at Program_Error one. > > gdb_test "continue" \ > - "Continuing\.$eol$catchpoint_constraint_error_msg" \ > + "Continuing\.$eol$eol$catchpoint_constraint_error_msg" \ > "continuing to second Constraint_Error exception handlers" > > gdb_test_no_output \ > @@ -148,7 +148,7 @@ gdb_test "catch handlers Program_Error if Global_Var = 4" \ > # the second one. > > gdb_test "continue" \ > - "Continuing\.$eol$catchpoint_program_error_msg" \ > + "Continuing\.$eol$eol$catchpoint_program_error_msg" \ > "continuing to Program_Error exception handlers" > > # Continue, the program should exit properly. > > base-commit: 9394690cb87b5ddc575b333bd0595b07a7a72c60 > -- > 2.35.3