From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) by sourceware.org (Postfix) with ESMTPS id 9C84C3858CDB for ; Sat, 9 Dec 2023 06:59:40 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 9C84C3858CDB Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.de ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 9C84C3858CDB Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=195.135.223.130 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1702105182; cv=none; b=tK2qd1bP38oivKGdlz2NFR/GPwFAOtUChB/S2fpbJwQcpAQkETUIskDDQVnqa1MAZmLjGEWicmuKJ8Hz7RFslHjPqPr/4UoBECcRoHhZSyApeqoAqH3LUfgRZ9HUDYiwMWyd907NGaG8d/zkUGqnOxd1+qIWVnwBJiC5y8dchms= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1702105182; c=relaxed/simple; bh=OVZOHxPUoyYmzHGJN6SrNP9ZTDzTAbdbfQUlpTloD2Y=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature: Message-ID:Date:MIME-Version:Subject:From:To; b=iFZL2HiX7HynHQhbkLv6uC/C0l6mSLKsDJHHIXOXTCKUtGSNvdV5w2mWgWS6yLnPESChF24slRlSSSCbrubPLj/F0sEGztoAZghlewYP7NpfMjJ8Ffsj1bc0iigNO8kdDoNiovtr7aIPGRGpvtwDxAuToSYysmvkNiXaIFs+d+Y= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 227F621F61; Sat, 9 Dec 2023 06:59:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1702105179; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=1/VL0mMURW3w8FPfXk2aH+cFkKbol4QKtTJmfKEF/v4=; b=BU0VDP8BIf7Shb6mN/UlqH4HDwua/1NfrX7bUvCAei+Q+UpKWR4MsBI1bsZd2jtXh3JlQA /ei2h8JbAxoa/JG06cc9Fu0dHQkub++SKmXs8qJNjJPSXCCDbnI8URtRwKc8VCPmU8t74u X/VhjhK9RDaewqSrL/gfm1j/RoN3y10= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1702105179; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=1/VL0mMURW3w8FPfXk2aH+cFkKbol4QKtTJmfKEF/v4=; b=8SccEimTPbQaPXhjS8jza7s62hWB1kvxhg87GOJXkA2eZvgO48qcnguXL78lH7znPwRU0X qLnTMvV1YzraBbAA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1702105179; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=1/VL0mMURW3w8FPfXk2aH+cFkKbol4QKtTJmfKEF/v4=; b=BU0VDP8BIf7Shb6mN/UlqH4HDwua/1NfrX7bUvCAei+Q+UpKWR4MsBI1bsZd2jtXh3JlQA /ei2h8JbAxoa/JG06cc9Fu0dHQkub++SKmXs8qJNjJPSXCCDbnI8URtRwKc8VCPmU8t74u X/VhjhK9RDaewqSrL/gfm1j/RoN3y10= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1702105179; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=1/VL0mMURW3w8FPfXk2aH+cFkKbol4QKtTJmfKEF/v4=; b=8SccEimTPbQaPXhjS8jza7s62hWB1kvxhg87GOJXkA2eZvgO48qcnguXL78lH7znPwRU0X qLnTMvV1YzraBbAA== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id EAC6C136D6; Sat, 9 Dec 2023 06:59:38 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id gO9KN1oQdGWyZAAAD6G6ig (envelope-from ); Sat, 09 Dec 2023 06:59:38 +0000 Message-ID: Date: Sat, 9 Dec 2023 07:59:47 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH 2/2] gdb/testsuite: tighten up some end-of-line patterns Content-Language: en-US From: Tom de Vries To: Tom Tromey , Andrew Burgess Cc: gdb-patches@sourceware.org References: <90f05fc11d1bf8fc39af46ac057a48e1327174e2.1701280438.git.aburgess@redhat.com> <878r6fcaf0.fsf@tromey.com> <13fad4ae-4d29-4819-b82e-5fee72b402ba@suse.de> In-Reply-To: <13fad4ae-4d29-4819-b82e-5fee72b402ba@suse.de> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Spam-Level: ********** X-Spam-Score: 10.29 X-Spam-Level: Authentication-Results: smtp-out1.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=BU0VDP8B; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=8SccEimT; dmarc=pass (policy=none) header.from=suse.de; spf=softfail (smtp-out1.suse.de: 2a07:de40:b281:104:10:150:64:97 is neither permitted nor denied by domain of tdevries@suse.de) smtp.mailfrom=tdevries@suse.de X-Rspamd-Server: rspamd2 X-Spamd-Result: default: False [-12.00 / 50.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; XM_UA_NO_VERSION(0.01)[]; TO_DN_SOME(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all:c]; RCVD_COUNT_THREE(0.00)[3]; DKIM_TRACE(0.00)[suse.de:+]; DMARC_POLICY_ALLOW(0.00)[suse.de,none]; MX_GOOD(-0.01)[]; DMARC_POLICY_ALLOW_WITH_FAILURES(-0.50)[]; NEURAL_HAM_SHORT(-0.20)[-1.000]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; BAYES_HAM(-3.00)[100.00%]; MID_RHS_MATCH_FROM(0.00)[]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; WHITELIST_DMARC(-7.00)[suse.de:D:+]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:dkim]; FUZZY_BLOCKED(0.00)[rspamd.com]; RCVD_TLS_ALL(0.00)[] X-Spam-Score: -12.00 X-Rspamd-Queue-Id: 227F621F61 X-Spam-Flag: NO X-Spam-Status: No, score=-10.9 required=5.0 tests=BAYES_00,BODY_8BITS,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,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: On 12/8/23 23:25, Tom de Vries wrote: > On 11/30/23 20:23, Tom Tromey wrote: >>>>>>> "Andrew" == Andrew Burgess writes: >> >> Andrew> Following on from the previous commit, I searched the >> testsuite for >> Andrew> places where we did: >> >> Andrew>   set eol "" >> >> Andrew> in most cases the could be replaced with "\r\n" >> though >> Andrew> in the stabs test I've switched to using the multi_line proc >> as that >> Andrew> seemed like a better choice. >> >> Andrew> In gdb.ada/info_types.exp I did need to add an extra use of >> $eol as >> Andrew> the previous pattern would match multiple newlines, and in >> this one >> Andrew> place we were actually expecting to match multiple newlines.  The >> Andrew> tighter pattern only matches a single newline, so we now need >> to be >> Andrew> explicit when multiple newlines are expected -- I think this >> is a good >> Andrew> thing. >> >> Andrew> All the tests are still passing for me after these changes. >> >> Looks good to me, thank you. >> Approved-By: Tom Tromey > > I  see some regressions: > ... > FAIL: gdb.ada/catch_assert_if.exp: continuing to expected failed assertion > FAIL: gdb.ada/catch_ex.exp: continuing to first exception > FAIL: gdb.ada/catch_ex.exp: continuing to second exception > FAIL: gdb.ada/catch_ex.exp: continuing to Program_Error exception > FAIL: gdb.ada/catch_ex.exp: continuing to failed assertion > FAIL: gdb.ada/catch_ex.exp: continuing to unhandled exception > FAIL: gdb.ada/catch_ex.exp: continuing to temporary catchpoint > FAIL: gdb.ada/excep_handle.exp: continuing to first Constraint_Error > exception handlers > FAIL: gdb.ada/excep_handle.exp: continuing and stopping in Storage_Error > exception handlers > FAIL: gdb.ada/excep_handle.exp: continuing without stopping to > Program_Error exception handlers > FAIL: gdb.ada/excep_handle.exp: continuing without stopping to > Storage_Error exception handlers > FAIL: gdb.ada/excep_handle.exp: continuing to second Constraint_Error > exception handlers > FAIL: gdb.ada/excep_handle.exp: continuing to Program_Error exception > handlers > ... > > For instance: > ... > (gdb) PASS: gdb.ada/catch_assert_if.exp: Check catch assertions with > condition > continue^M > Continuing.^M > ^M > Catchpoint 2, failed assertion at 0x000000000040201a in bla () at > /data/vries/gdb/binutils-gdb.git/gdb/testsuite/gdb.ada/catch_assert_if/bla.adb:32^M > 32            pragma Assert (Global_Var = 1, "Error #2"); -- STOP^M > (gdb) FAIL: gdb.ada/catch_assert_if.exp: continuing to expected failed > assertion > ... I see this failure both with openSUSE Leap 15.4 and openSUSE Tumbleweed. Fixed on both by: ... diff --git a/gdb/testsuite/gdb.ada/catch_assert_if.exp b/gdb/testsuite/gdb.ada/catch_assert_if.exp index 9b094d88dc8..dd9db10ebe1 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" \ ... Does this pass for you without this patch? Thanks, - Tom