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.129.124]) by sourceware.org (Postfix) with ESMTPS id 349B3388CA61 for ; Thu, 15 Dec 2022 13:22:52 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 349B3388CA61 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1671110571; h=from:from:reply-to: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=fz3gTrYOqFZVXCLkUZfGtRDito3QVbsnfRXqRWSLn+w=; b=K8YGKDClw1M+eI/uLGrMxygyCeYqCi0bIhVvNR+hqb2LpkNpJ/aZAGlFq2KKaBTJaGFhAJ 9c8EpDi5pihhucNMUAAoaaYppX/Z4fRU6RzSB0hYmAmX/plOqlUI/jZY1S9welFetq5v+d LBz8U+H+LGN7SqjlMTSQ4cPm0FHCxZ0= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-55-gaw3rNSNNriwGcg8Y7CnNA-1; Thu, 15 Dec 2022 08:22:48 -0500 X-MC-Unique: gaw3rNSNNriwGcg8Y7CnNA-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id E12203C0F80B; Thu, 15 Dec 2022 13:22:46 +0000 (UTC) Received: from tucnak.zalov.cz (unknown [10.39.195.114]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9A7B91121314; Thu, 15 Dec 2022 13:22:46 +0000 (UTC) Received: from tucnak.zalov.cz (localhost [127.0.0.1]) by tucnak.zalov.cz (8.17.1/8.17.1) with ESMTPS id 2BFDMf5u3327494 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Thu, 15 Dec 2022 14:22:41 +0100 Received: (from jakub@localhost) by tucnak.zalov.cz (8.17.1/8.17.1/Submit) id 2BFDMeq33327493; Thu, 15 Dec 2022 14:22:40 +0100 Date: Thu, 15 Dec 2022 14:22:39 +0100 From: Jakub Jelinek To: Andreas Schwab Cc: Jakub Jelinek via Gcc-rust , Richard Biener , Arthur Cohen , Gaius Mulley , gcc-patches@gcc.gnu.org Subject: Re: [PATCH] testsuite: Add support for Rust and Modula-2 effective target tests Message-ID: Reply-To: Jakub Jelinek References: MIME-Version: 1.0 In-Reply-To: X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=us-ascii Content-Disposition: inline X-Spam-Status: No, score=-3.9 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE,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: On Thu, Dec 15, 2022 at 02:03:36PM +0100, Andreas Schwab wrote: > On Dez 15 2022, Jakub Jelinek via Gcc-rust wrote: > > > @@ -58,13 +60,15 @@ proc check_compile {basename type conten > > set options "" > > } > > switch -glob -- $contents { > > - "*/* Assembly*" { set src ${basename}[pid].S } > > + "*/\* Assembly*" { set src ${basename}[pid].S } > > "*! Fortran*" { set src ${basename}[pid].f90 } > > "*// C++*" { set src ${basename}[pid].cc } > > "*// D*" { set src ${basename}[pid].d } > > "*// ObjC++*" { set src ${basename}[pid].mm } > > "*/* ObjC*" { set src ${basename}[pid].m } > > You probably want to quote the * here too. You're right on both, I've committed this follow-up after verifying that Assembly test still works (it works even with \\\* but doesn't with \\\\*) and verifying that changing check_effective_target_property_1_needed to have // Assembly instead of /* Assembly incorrectly works with "*/* Assembly*", "*/\* Assembly*" but correctly doesn't work with "*/\\* Assembly*" or "*/\\\* Assembly*". Committed to trunk. Sorry. 2022-12-15 Jakub Jelinek * lib/target-supports.exp (check_compile): Further quoting fixes for /* Assembly, /* ObjC and (* Modula-2 *) checks. --- gcc/testsuite/lib/target-supports.exp.jj 2022-12-15 13:57:40.000000000 +0100 +++ gcc/testsuite/lib/target-supports.exp 2022-12-15 14:14:02.987854385 +0100 @@ -60,15 +60,15 @@ proc check_compile {basename type conten set options "" } switch -glob -- $contents { - "*/\* Assembly*" { set src ${basename}[pid].S } + "*/\\* Assembly*" { set src ${basename}[pid].S } "*! Fortran*" { set src ${basename}[pid].f90 } "*// C++*" { set src ${basename}[pid].cc } "*// D*" { set src ${basename}[pid].d } "*// ObjC++*" { set src ${basename}[pid].mm } - "*/* ObjC*" { set src ${basename}[pid].m } + "*/\\* ObjC*" { set src ${basename}[pid].m } "*// Go*" { set src ${basename}[pid].go } "*// Rust*" { set src ${basename}[pid].rs } - "*(\* Modula-2*" { set src ${basename}[pid].mod } + "*(\\* Modula-2*" { set src ${basename}[pid].mod } default { switch -- $tool { "objc" { set src ${basename}[pid].m } Jakub