From patchwork Wed Apr 5 14:04:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arthur Cohen X-Patchwork-Id: 79718 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp363239vqo; Wed, 5 Apr 2023 07:48:00 -0700 (PDT) X-Google-Smtp-Source: AKy350b83xUgcHRECF1+1ggLHaVdGH5hqcaC3lecYuvjEeZR+SfEf0j14AsVGPtDByUGmq/MdkAd X-Received: by 2002:a17:906:3b4e:b0:932:fc34:88f with SMTP id h14-20020a1709063b4e00b00932fc34088fmr2998552ejf.11.1680706080713; Wed, 05 Apr 2023 07:48:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680706080; cv=none; d=google.com; s=arc-20160816; b=m68d2wsQJMZVjvbRr8zeJ9UmUuXVbtu37UvNZmT9NsP5e/492es3mPz8X9fj3AxNL9 1rUSrBdknkuKdmCJm8tRT1yV4BYYooOSQ05mJ3dIMRSkXjrxi6SfSDcxd+BHwRjctNtc 7o1k06pXjzXLR3zaDfQRSkKuaa/G7fq8Q8e5HEPAVpcXaWeT9eSwypyCWivd97cIDI/k KDv39TzcxfZwUSTBwcMvPXm6IcftGaeTrdJqkzJmeyZpsRDJZiMPuBNE20cJ2GsdQFeF V3s1e0gy3sUXFYQ2RgTNFFRSVQMGDL/J1S4IhBkUaLLpBeubG7TUomluty6EhpMalr2n 4Wrw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature:dmarc-filter :delivered-to; bh=zCZC3xHACqHMlCWfqnr+JlV98oSyoB9gbvAMgMf9+VE=; b=ZjGlAQReezHum0M50YbrcjOh8/9g4WL5LF1/0cp1xaN+K/oSEAb0GEqIV2QAVkjA2E kSKtVFGQI172gk1YXIgTz0aC12zQi4+R+p1DLZx4OVN3PHWLGRDdl4h+nknxtbE01Dyy EvI37288MMCP0PwrqXSbHyvjJkotxLCvlHx209IudfmKpy+Yv/UUOmOy4xymmsYW/sK2 jHZcHd2nJoRLYIOSmir6goZOgVFHP8eSZPKyvnkkTMT5yA1KobLUFPYBqqNnd4ftOTOm SXJkcBIAfy+AXn8+oJEOCXWg59PZxD5yXc1r2dzCXoFwGUEm8cEiBnzZxHMARfSV8kMf mSsA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@embecosm.com header.s=google header.b=eyNmOq16; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org" Received: from sourceware.org (ip-8-43-85-97.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id y10-20020a1709064b0a00b008c1d4ed00d3si696174eju.792.2023.04.05.07.48.00 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Apr 2023 07:48:00 -0700 (PDT) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; Authentication-Results: mx.google.com; dkim=fail header.i=@embecosm.com header.s=google header.b=eyNmOq16; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org" Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id AF6FD38C90C2 for ; Wed, 5 Apr 2023 14:17:22 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wm1-x331.google.com (mail-wm1-x331.google.com [IPv6:2a00:1450:4864:20::331]) by sourceware.org (Postfix) with ESMTPS id B4DF0388266A for ; Wed, 5 Apr 2023 14:06:25 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org B4DF0388266A Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=embecosm.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=embecosm.com Received: by mail-wm1-x331.google.com with SMTP id n10-20020a05600c4f8a00b003ee93d2c914so23483429wmq.2 for ; Wed, 05 Apr 2023 07:06:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=embecosm.com; s=google; t=1680703585; h=content-transfer-encoding:mime-version:reply-to:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to; bh=zCZC3xHACqHMlCWfqnr+JlV98oSyoB9gbvAMgMf9+VE=; b=eyNmOq16VwK6d0kwD7Ay8wsTKgy/Tjq358KXESB426Dg4lMyBlm8MiSfi5zMayiHJU O8WpsBjtbgp61JXZePw4Al3qH07LTlpMTWlXYYh/XHZqraVN7upzgtDXUZbuc2pbAydi J4oJZ2oI88Ung2f/cVUeSMcg/PwFGrho+XO3WjYDduCcZBHyHXlrIsevxAHZb7+8JZZh 4ADfph/ippywHFJ64Mc31dcDORlhp15fgKA9CelFmVfXbuxuYQi88uI4RTw/Mi5XOKxz Xu0lBMoVWDBYZr4AFFO1R4h0GxBlGqx6nABiH7aGruu6tDFTd2Yaxmyn+pxt8kF5LRzb 0I8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680703585; h=content-transfer-encoding:mime-version:reply-to:references :in-reply-to:message-id:date:subject:cc:to:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=zCZC3xHACqHMlCWfqnr+JlV98oSyoB9gbvAMgMf9+VE=; b=PhJPC4NyH27VmDTw0HWFyMd1OmtT78ChF36mnvmGg6VfplFWnK3HEb9zC4HAh13f3V DO4D6Q5zpr2fI6SGxou58An+vm+c/bBIqyufdMnr1kMebgXwQ3h8mBzrxlTKTw6iMKnS EWEavuB09khI3LnXOwLIL5xXamqXmAyUwUFbxSeO1t4R5ojTAGvfIwgKiwosXd8dShon 0vp9ti4EXJEBex43HWmIcUfXWMPWjaIMgKnTjQ1iljNyOsv5V8t+STYpDXHAkQvUVKdx 5miOJQbG8q2UwLk8slUxD5knXdHnJ7yLU8ZyW8a+IqrTV6tJZC+Ym2Qr6E8ZtVye+JQk P03g== X-Gm-Message-State: AAQBX9cX6levzsAeQ2KHKF4ln36I7tgPZhkBoYczAmKfVxx6KCWTqdq1 r4dXngolz6fS/r+IZZmcZXWlwxgeat1g7PyA/g== X-Received: by 2002:a7b:c5cd:0:b0:3ea:d611:f8 with SMTP id n13-20020a7bc5cd000000b003ead61100f8mr4903692wmk.38.1680703585074; Wed, 05 Apr 2023 07:06:25 -0700 (PDT) Received: from platypus.localdomain ([62.23.166.218]) by smtp.gmail.com with ESMTPSA id ay8-20020a05600c1e0800b003edddae1068sm2330150wmb.9.2023.04.05.07.06.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Apr 2023 07:06:24 -0700 (PDT) From: arthur.cohen@embecosm.com To: gcc-patches@gcc.gnu.org Cc: gcc-rust@gcc.gnu.org, Thomas Schwinge Subject: [committed 81/88] gccrs: Fix up DejaGnu directives in 'rust/compile/issue-1830_{bytes, str}.rs' test cases [#1838] Date: Wed, 5 Apr 2023 16:04:05 +0200 Message-Id: <20230405140411.3016563-82-arthur.cohen@embecosm.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230405140411.3016563-1-arthur.cohen@embecosm.com> References: <20230405140411.3016563-1-arthur.cohen@embecosm.com> MIME-Version: 1.0 X-Spam-Status: No, score=-14.2 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: arthur.cohen@embecosm.com Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1762348059196948560?= X-GMAIL-MSGID: =?utf-8?q?1762348059196948560?= From: Thomas Schwinge 'dg-excess-errors' "indicates that the test is expected to fail due to compiler messages that are not handled by 'dg-error', [etc.]". It's argument doesn't specify the message to match but just just a comment. Here, however, we'd like to match specific compiler messages, so we should use 'dg-error', etc. Use the magic line number zero as the compiler error diagnostic doesn't tell which line the error occurred on (separate issue to resolve). This gives us: -XFAIL: rust/compile/issue-1830_str.rs (test for excess errors) +PASS: rust/compile/issue-1830_bytes.rs at line 8 (test for errors, line ) +PASS: rust/compile/issue-1830_bytes.rs (test for excess errors) -XFAIL: rust/compile/issue-1830_bytes.rs (test for excess errors) +PASS: rust/compile/issue-1830_str.rs at line 8 (test for errors, line ) +PASS: rust/compile/issue-1830_str.rs (test for excess errors) Fix-up for recent GCC/Rust master branch #1838 commit cf9ed4001eec6a22686d19a13f7de8ac94f9cb2a "testsuite: Add empty string macro test". gcc/testsuite/ * rust/compile/issue-1830_bytes.rs: Fix up DejaGnu directives. * rust/compile/issue-1830_str.rs: Likewise. --- gcc/testsuite/rust/compile/issue-1830_bytes.rs | 3 ++- gcc/testsuite/rust/compile/issue-1830_str.rs | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/gcc/testsuite/rust/compile/issue-1830_bytes.rs b/gcc/testsuite/rust/compile/issue-1830_bytes.rs index dcc53b73b19..997d4ca0cdc 100644 --- a/gcc/testsuite/rust/compile/issue-1830_bytes.rs +++ b/gcc/testsuite/rust/compile/issue-1830_bytes.rs @@ -4,5 +4,6 @@ macro_rules! include_bytes { } fn main() { - include_bytes!(""); // { dg-excess-errors "Is a directory" } + include_bytes!(""); + // { dg-error {cannot open filename [^\n\r]+: Is a directory} {} { target *-*-* } 0 } } diff --git a/gcc/testsuite/rust/compile/issue-1830_str.rs b/gcc/testsuite/rust/compile/issue-1830_str.rs index 6cf835ba9bd..fcf2dc988d3 100644 --- a/gcc/testsuite/rust/compile/issue-1830_str.rs +++ b/gcc/testsuite/rust/compile/issue-1830_str.rs @@ -4,5 +4,6 @@ macro_rules! include_str { } fn main() { - include_str!(""); // { dg-excess-errors "Is a directory" } + include_str!(""); + // { dg-error {cannot open filename [^\n\r]+: Is a directory} {} { target *-*-* } 0 } }