From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp-out2.suse.de (smtp-out2.suse.de [IPv6:2a07:de40:b251:101:10:150:64:2]) by sourceware.org (Postfix) with ESMTPS id A4E853858C32 for ; Fri, 5 Apr 2024 08:57:03 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org A4E853858C32 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 A4E853858C32 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a07:de40:b251:101:10:150:64:2 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1712307425; cv=none; b=GR/nAsQQzUFUhYU7wPXfas8vWkezVMhNm4iGej1AQBdBZH6l8UuWabQxOB0LQqMwMthrt0lmTr+KhWxIw2EZFq8tZ4aRviEXBdicSMokcy0fUxTeiyV8VQ9gQChrEhT8hoCNTiqWXQJwI9KopxphUWpS5qADUj0MBq/a6ufYR8M= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1712307425; c=relaxed/simple; bh=QeMYWZQCWXm7s7aQXBpa86iTxj+CG87zzYqF0oohTsM=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:Date: From:To:Subject:Message-ID:MIME-Version; b=ECkxVVm8unmYwU0QB/df6NIFmR6/vFb0vo0qsavxEZZQ9E4aymxkDYJLrlTaf/E7BmqzE6p89z2XOR5jik/ALtRGZtEZ+q9+TN6AeaDxjBP9sACMOe50VanfkFnRcJgccQElxIBategNyB6u0G0iiKqDCAGT4nvJ6PDd4jxx2EU= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from [10.168.5.241] (unknown [10.168.5.241]) (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-out2.suse.de (Postfix) with ESMTPS id F31BF1F76B; Fri, 5 Apr 2024 08:57:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1712307422; 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=ICBur0Lcq9fbUnAlwFUAwAJYtwE1nkyBPKSGjUNktaU=; b=iTSq7lt2Bh23i/4Nxfknh2ClOzwPppGQ4gXLVVd0QTESyjaj+pzMCXKz1I3C5qBugxam3s eLifnKK3+HZmcSv9PLuWvCBjOdCF8vmez14ZTijMgoxGCSspTocSz0EgTKtwhBAPywv03f hjPpFDIYPtJBOw5oNObjysV43awmRs4= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1712307422; 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=ICBur0Lcq9fbUnAlwFUAwAJYtwE1nkyBPKSGjUNktaU=; b=Vc/doyYjmhTPYvLsOHuPH4wZlUDAtYbnyGhg1iA0PL+LVOz3fEEN0oB0acbwytyYoGoiyE ER/kPDYwoYQnHfAg== Authentication-Results: smtp-out2.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1712307422; 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=ICBur0Lcq9fbUnAlwFUAwAJYtwE1nkyBPKSGjUNktaU=; b=iTSq7lt2Bh23i/4Nxfknh2ClOzwPppGQ4gXLVVd0QTESyjaj+pzMCXKz1I3C5qBugxam3s eLifnKK3+HZmcSv9PLuWvCBjOdCF8vmez14ZTijMgoxGCSspTocSz0EgTKtwhBAPywv03f hjPpFDIYPtJBOw5oNObjysV43awmRs4= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1712307422; 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=ICBur0Lcq9fbUnAlwFUAwAJYtwE1nkyBPKSGjUNktaU=; b=Vc/doyYjmhTPYvLsOHuPH4wZlUDAtYbnyGhg1iA0PL+LVOz3fEEN0oB0acbwytyYoGoiyE ER/kPDYwoYQnHfAg== Date: Fri, 5 Apr 2024 10:57:01 +0200 (CEST) From: Richard Biener To: Jakub Jelinek cc: Jan Hubicka , =?ISO-8859-15?Q?J=F8rgen_Kvalsvik?= , gcc-patches@gcc.gnu.org Subject: Re: [PATCH] testsuite: Fix up error on gcov1.d In-Reply-To: Message-ID: References: <20240223111800.1209438-1-j@lambda.is> <20240223111800.1209438-2-j@lambda.is> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="8323328-882614224-1712307422=:8691" X-Spam-Level: X-Spamd-Result: default: False [-3.30 / 50.00]; BAYES_HAM(-3.00)[100.00%]; CTYPE_MIXED_BOGUS(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.20)[-0.999]; MIME_GOOD(-0.10)[multipart/mixed,text/plain]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; MISSING_XM_UA(0.00)[]; MIME_TRACE(0.00)[0:+,1:+]; ARC_NA(0.00)[]; RCVD_COUNT_ZERO(0.00)[0]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; FROM_EQ_ENVFROM(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; TO_MATCH_ENVRCPT_ALL(0.00)[]; FUZZY_BLOCKED(0.00)[rspamd.com]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:email,gcc.target:url] X-Spam-Score: -3.30 X-Spam-Status: No, score=-4.9 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,KAM_SHORT,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: This message is in MIME format. The first part should be readable text, while the remaining parts are likely unreadable without MIME-aware tools. --8323328-882614224-1712307422=:8691 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: 8BIT On Fri, 5 Apr 2024, Jakub Jelinek wrote: > On Fri, Feb 23, 2024 at 12:18:00PM +0100, Jørgen Kvalsvik wrote: > > This is a mostly straight port from the gcov-19.c tests from the C test > > suite. The only notable differences from C to D are that D flips the > > true/false outcomes for loop headers, and the D front end ties loop and > > ternary conditions to slightly different locus. > > > > The test for >64 conditions warning is disabled as it either needs > > support from the testing framework or a something similar to #pragma GCC > > diagnostic push to not cause a test failure from detecting a warning. > > > > gcc/testsuite/ChangeLog: > > > > * gdc.dg/gcov.exp: New test. > > * gdc.dg/gcov1.d: New test. > > Unfortunately, this doesn't work. > I see > PASS: gdc.dg/gcov1.d execution test > ERROR: (DejaGnu) proc "run-gcov conditions { --conditions gcov1.d }" does not exist. > The error code is TCL LOOKUP COMMAND run-gcov > The info on the error is: > invalid command name "run-gcov" > while executing > "::tcl_unknown run-gcov conditions { --conditions gcov1.d }" > ("uplevel" body line 1) > invoked from within > "uplevel 1 ::tcl_unknown $args" > ERROR: gdc.dg/gcov1.d : error executing dg-final: invalid command name "run-gcov" > both on x86_64-linux and i686-linux. > The problem is that the test hasn't been added to a new directory, but > to a directory already covered by a different *.exp file - dg.exp. > Now, usually either one has a test directory like gcc.misc-tests where > there are many *.exp files but each *.exp file globs for its own tests, > or there is one *.exp per directory and covers everything in there. > By having both dg.exp and gcov.exp in the same directory with dg.exp > covering all *.d files in there and gcov gcov*.d in there, the gcov*.d > tests are tested twice, once using the dg.exp driver and once using gcov.exp > driver. With the latter, they do work properly, with the former they don't > because gcov.exp lib file isn't loaded and so run-gcov isn't available. > > The following patch fixes that similarly how g++.dg/modules/modules.exp, > gcc.target/s390/s390.exp or gcc.target/i386/i386.exp deal with that, > by pruning some tests based on glob patterns from the list. > > Tested on x86_64-linux with make -j32 check-d, ok for trunk? OK. Richard. > 2024-04-05 Jakub Jelinek > > * gdc.dg/dg.exp: Prune gcov*.d from the list of tests to run. > * gdc.dg/gcov.exp: Update copyright years. > > --- gcc/testsuite/gdc.dg/dg.exp.jj 2024-01-03 22:33:38.249693029 +0100 > +++ gcc/testsuite/gdc.dg/dg.exp 2024-04-05 10:20:13.518823037 +0200 > @@ -30,7 +30,8 @@ dg-init > > # Main loop. > gdc-dg-runtest [lsort \ > - [glob -nocomplain $srcdir/$subdir/*.d ] ] "" $DEFAULT_DFLAGS > + [prune [glob -nocomplain $srcdir/$subdir/*.d ] \ > + $srcdir/$subdir/gcov*.d ] ] "" $DEFAULT_DFLAGS > > # All done. > dg-finish > --- gcc/testsuite/gdc.dg/gcov.exp.jj 2024-04-04 21:45:56.025155257 +0200 > +++ gcc/testsuite/gdc.dg/gcov.exp 2024-04-05 10:20:23.678682559 +0200 > @@ -1,4 +1,4 @@ > -# Copyright (C) 1997-2023 Free Software Foundation, Inc. > +# Copyright (C) 1997-2024 Free Software Foundation, Inc. > > # This program is free software; you can redistribute it and/or modify > # it under the terms of the GNU General Public License as published by > > Jakub > > -- Richard Biener SUSE Software Solutions Germany GmbH, Frankenstrasse 146, 90461 Nuernberg, Germany; GF: Ivo Totev, Andrew McDonald, Werner Knoblich; (HRB 36809, AG Nuernberg) --8323328-882614224-1712307422=:8691--