From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-ej1-x629.google.com (mail-ej1-x629.google.com [IPv6:2a00:1450:4864:20::629]) by sourceware.org (Postfix) with ESMTPS id A43E13858430; Fri, 30 Sep 2022 21:08:07 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org A43E13858430 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-ej1-x629.google.com with SMTP id l14so11470398eja.7; Fri, 30 Sep 2022 14:08:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date; bh=AgO5b+zk49Ah0byR9DzEWKV6aHvnAaG0Fk2J/8lo2bo=; b=BSQ3ljGfglgU0BQEOqW7yRnyBzSuA6UJEomCw0a32La5T8dOW+GMjsz8U6+xhrSzyl 6E526p+sHN+NbpZYRdK7bDV54yMy1S7kHYPHBzQj+XGN/TbHaxDg/NswieiLonEaHHY0 ycADC3TTHQaEWLBKXW0RhwOnhsSQtpYoCBlxeygDrf/+7iQe8xZ5FBjNky677DBVgE57 zFbCLPB0/D/f+8B2IcKNQlfjmYfvtaPb2cXGu2PJEF3LacUqjbpgFdymoQTUYMNKwCs7 w8LXOQt4C9HvaAw8/JvoMa0mq2HWFYOJiixRQuXbTTewDZ71ev16nVekXMxBCYBHrQL8 mhgg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date; bh=AgO5b+zk49Ah0byR9DzEWKV6aHvnAaG0Fk2J/8lo2bo=; b=dmyDofm8x+wUJ2CgR6XpF9h46qQt+yoRpSQQf3GQ5bMthLYOw46fql2QBvTFQ+8hi5 ycvcyEX87I0+ZV4CARw3iLgXoyym121Uv9LTaQjdRcLExGXBI7f9oBBDBrbZKweBdajn gzoUrDIx4lDFojbZQrV0/DoWXiLBLQuiR9SexjUY7uCrjLlIBi2yaURDHzBg5d72nam9 woKSqJyekWVX1LolpYvUVRirzWgZGDa8L6YdxGd1eRqOt1DZ3YPmkFMfIyHLoCsV689z 44WYBjHjdcgCx9NRT8Z/zDiX+M+tj0J1vKOL9YCvMVKGLDws0iTNAKU6JWj6wrQwtXNn I6Ew== X-Gm-Message-State: ACrzQf1TbPjntFSJ5hjTNy5tURBstgDh5LjtHXOXLDvevUlAMpuCXcPv necCu8xK2j4CqkMxgEq7ltvVHHyyGmlH+DSNYi4= X-Google-Smtp-Source: AMsMyM7PMS30WDFMVisOMcpii3w+6hcInXDtpqjNrt31dgd3g/M0zcgA1kA+fp2CurBHXxz2bSF4nZplbzGaP4ZvuwU= X-Received: by 2002:a17:907:7f13:b0:783:6227:b939 with SMTP id qf19-20020a1709077f1300b007836227b939mr7355280ejc.416.1664572086294; Fri, 30 Sep 2022 14:08:06 -0700 (PDT) MIME-Version: 1.0 References: <20220930153845.2268381-1-torbjorn.svensson@foss.st.com> In-Reply-To: From: Jonathan Wakely Date: Fri, 30 Sep 2022 22:07:54 +0100 Message-ID: Subject: Re: [PATCH] testsuite: Windows paths use \ and not / To: Jonathan Wakely Cc: Jakub Jelinek , =?UTF-8?Q?Torbj=C3=B6rn_SVENSSON?= , "libstdc++" , gcc-patches@gcc.gnu.org, nathan@acm.org Content-Type: multipart/mixed; boundary="000000000000e8574105e9eb63f1" X-Spam-Status: No, score=-6.7 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,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: --000000000000e8574105e9eb63f1 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Fri, 30 Sept 2022 at 19:13, Jonathan Wakely via Libstdc++ wrote: > > On Fri, 30 Sept 2022 at 19:07, Jonathan Wakely wrote= : > > > > On Fri, 30 Sept 2022 at 19:04, Jonathan Wakely wro= te: > > > > > > On Fri, 30 Sept 2022 at 18:55, Jakub Jelinek wrote= : > > > > > > > > On Fri, Sep 30, 2022 at 06:47:07PM +0100, Jonathan Wakely via Gcc-p= atches wrote: > > > > > On Fri, 30 Sept 2022 at 17:26, Jonathan Wakely wrote: > > > > > > > > > > > > On Fri, 30 Sept 2022 at 17:04, Torbj=C3=B6rn SVENSSON > > > > > > wrote: > > > > > > > > > > > > > > libstdc++-v3/testsuite: > > > > > > > > > > > > > > * 20_util/bind/ref_neg.cc: Prune Windows paths too. > > > > > > > > > > > > Please CC the libstdc++ for libstdc++ patches. > > > > > > > > > > > > OK for trunk, thanks. > > > > > > > > > > I'm seeing errors now on x86_64-linux: > > > > > > > > > > ERROR: 20_util/bind/ref_neg.cc: unknown dg option: /\\ for " > > > > > dg-prune-output 53 "[/\\](functional|bits/invoke.h):" " > > > > > > > > > > ERROR: 20_util/bind/ref_neg.cc: unknown dg option: /\\ for " > > > > > dg-prune-output 53 "[/\\](functional|bits/invoke.h):" " > > > > > > > > Bet it should be > > > > // { dg-prune-output "\[/\\](functional|bits\[/\\]invoke.h):" } > > > > or so. Completely untested. > > > > > > That fixes the error, but now the regex doesn't match so there are > > > still excess errors. It needs to be: > > > > > > // { dg-prune-output ".*\[/\\](functional|bits\[/\\]invoke.h):.*" } > > > > > > Without any regex special characters, there's an implicit .* before > > > and after the pattern. But when you use any regex special characters > > > in the pattern, it stops working. I can't remember why. I figured it > > > out once. > > > > It looks like just adding .* at the start is enough: > > > > // { dg-prune-output ".*\[/\\](functional|bits\[/\\]invoke.h):" } > > > > But that's so ugly, I'm tempted to replace that prune with something di= fferent. > > I'll finish testing this and push it. I committed this instead, with no .* in the pattern. --000000000000e8574105e9eb63f1 Content-Type: text/plain; charset="US-ASCII"; name="patch.txt" Content-Disposition: attachment; filename="patch.txt" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_l8oz88s00 Y29tbWl0IDcwNjlkMDNiYTRhZDYxMzMyMjViODlkNDMzZDllODZmMGIwNzQ1YjgKQXV0aG9yOiBK b25hdGhhbiBXYWtlbHkgPGp3YWtlbHlAcmVkaGF0LmNvbT4KRGF0ZTogICBGcmkgU2VwIDMwIDE5 OjEwOjI5IDIwMjIKCiAgICBsaWJzdGRjKys6IEZpeCBicm9rZW4gZGctcHJ1bmUtb3V0cHV0CiAg ICAKICAgIFRoZSBuZXcgcGF0dGVybiBpbiB0aGUgZGctcHJ1bmUtb3V0cHV0IGRpcmVjdGl2ZSBk b2Vzbid0IHdvcmsuIEluc3RlYWQKICAgIG9mIGEgbWVzc3kgcmVnZXggZnVsbCBvZiBsZWFuaW5n IHRvb3RocGlja3MsIGp1c3QgbWF0Y2ggb24gdGhlCiAgICBkaWFnbm9zdGljIHRleHQgaW5zdGVh ZCBvZiB0aGUgaGVhZGVyIHBhdGhzLgogICAgCiAgICBsaWJzdGRjKystdjMvQ2hhbmdlTG9nOgog ICAgCiAgICAgICAgICAgICogdGVzdHN1aXRlLzIwX3V0aWwvYmluZC9yZWZfbmVnLmNjOiBGaXgg ZGctcHJ1bmUtb3V0cHV0CiAgICAgICAgICAgIGRpcmVjdGl2ZS4KCmRpZmYgLS1naXQgYS9saWJz dGRjKystdjMvdGVzdHN1aXRlLzIwX3V0aWwvYmluZC9yZWZfbmVnLmNjIGIvbGlic3RkYysrLXYz L3Rlc3RzdWl0ZS8yMF91dGlsL2JpbmQvcmVmX25lZy5jYwppbmRleCAxZTlmM2U3ZmVjZS4uYTc4 OTM1Nzc1YzIgMTAwNjQ0Ci0tLSBhL2xpYnN0ZGMrKy12My90ZXN0c3VpdGUvMjBfdXRpbC9iaW5k L3JlZl9uZWcuY2MKKysrIGIvbGlic3RkYysrLXYzL3Rlc3RzdWl0ZS8yMF91dGlsL2JpbmQvcmVm X25lZy5jYwpAQCAtNTAsNyArNTAsNyBAQCB2b2lkIHRlc3QwMigpCiAKIC8vIElnbm9yZSB0aGUg cmVhc29ucyBmb3IgZGVkdWN0aW9uL3N1YnN0aXR1dGlvbiBmYWlsdXJlIGluIHRoZSBoZWFkZXJz LgogLy8gQXJyYW5nZSBmb3IgdGhlIG1hdGNoIHRvIHdvcmsgb24gaW5zdGFsbGVkIHRyZWVzIGFz IHdlbGwgYXMgYnVpbGQgdHJlZXMuCi0vLyB7IGRnLXBydW5lLW91dHB1dCAiWy9cXF0oZnVuY3Rp b25hbHxiaXRzL2ludm9rZS5oKToiIH0KKy8vIHsgZGctcHJ1bmUtb3V0cHV0ICJubyB0eXBlIG5h bWVkICd0eXBlJyBpbiAnc3RydWN0IHN0ZDo6cmVzdWx0X29mIiB9CiAKIGludCBtYWluKCkKIHsK --000000000000e8574105e9eb63f1--