From patchwork Tue Jan 30 12:07:57 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arthur Cohen X-Patchwork-Id: 1892884 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=embecosm.com header.i=@embecosm.com header.a=rsa-sha256 header.s=google header.b=UlQtnk/V; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=server2.sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=patchwork.ozlabs.org) Received: from server2.sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4TPPpV37s4z23dQ for ; Tue, 30 Jan 2024 23:38:10 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 6D14A3831E36 for ; Tue, 30 Jan 2024 12:38:08 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wr1-x432.google.com (mail-wr1-x432.google.com [IPv6:2a00:1450:4864:20::432]) by sourceware.org (Postfix) with ESMTPS id 56B7D3857731 for ; Tue, 30 Jan 2024 12:12:06 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 56B7D3857731 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=embecosm.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=embecosm.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 56B7D3857731 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::432 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1706616782; cv=none; b=ZSfmQhTWT3A+wd+L4EaqKealLnCJM5fBBWOFnjq5ZHs9uO5jTgBsiPbu4Yms9i85YSy4DFJKJzD/vRuf1l5LAediDCKrxD+xaXMBbRHq8hNPEMnSvMqckEF4HVMaDPpEjl9PHZ1OiR3wDWPiT6T51tSoUjl8PCnTlgbauOcH71c= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1706616782; c=relaxed/simple; bh=n5PTnWOeEvyeSnTJG65pYS2PFartb12WnWjOXjHvUEc=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=IBBgpy4WyPUKRMQxApKEKJjsmC8EHzsmWMrK68+to2iy7s1f0YNZaLuA7xN426Smo6Ufba5xtxcORAEUGGf313HX60BAFRd6iNjbWYMvCy5uCAagK3meVTGNeC6i5ySUCmL7PVhp8mnpP0HyJ7hl/KvkQF2XNqYNq00EuG5oPaY= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-wr1-x432.google.com with SMTP id ffacd0b85a97d-33ae74e5394so1286115f8f.3 for ; Tue, 30 Jan 2024 04:12:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=embecosm.com; s=google; t=1706616720; x=1707221520; darn=gcc.gnu.org; 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=T26TFjSRJTXXAm4/FTewxtu2dTAQIfHbyVx+Ih7LfLk=; b=UlQtnk/Vxb29kwKoX3KItG/y9upO6ytLeXMdONAMvdcIV0NKprncD7WrqkKCVwBHWY ZiWbaSurnvwF0jWzGi7AH/6qkytz7vcqzKmNuQKpARqpX7g99oHy5zO2JVhfayzAClQG popApAiyTgUkQCDRkvjQ81PjB9ohCqlrfnabWsmS/zOTIenUgo9iKehQpI51Gvvf+A5g 7tayWFHH/VNh/ksxn9H+RJys341NXSpeDY5oQ3+73b+zYvrQWm5jEenHPdMPGYFpL2VK HlZ3Xu6oJZeYrqQqS5ggqIvchZ6kSrBW99iFc/TxEKDOrmAV+T3n368c+Si0sxEawqGi VhfA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706616720; x=1707221520; 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=T26TFjSRJTXXAm4/FTewxtu2dTAQIfHbyVx+Ih7LfLk=; b=TVgWmXzzBbDei9tjBL8azTPMECBvgH0BNQ1WZrq0e6s+t8eNcX3iW3vdYYdRyfQc7p IMOe8Nk0nFlxPl3yq4ZRlbrOMkIxIcYN0ZASNa6aEaOldT43tKDRNCsPsFAihJt3aMgu iGZO+Gw13wCdpMAyj6t0HAgmcJLmTyyiCwn+esOfQX4b2LcJpcHhpPN1TlEqAxwGS+3k u99TrcPbA26iSKZbGlHKZihZr9OyImw0gU8+a7fGhnnq4fimjWKuRoYFoaCRPID5k07m LHjmVO5EQTnyKjtq6Y6TSvfJfs//dh5i9Ua88SMq3g5IJGz90iKNqXqeorcVZV2n3aoi 0dTw== X-Gm-Message-State: AOJu0YwxQqaiEjG8+rSdgissohLdDC6l511xSz7gHPMrNc/jCBbsQUmZ Pfkyul2C5bIR7N6BShfdK8NqUIRvwgTYmk2hW/Hzyvb/ME+7uJE6hGcb9JEttiub+Vb1MX1lE2M NEA== X-Google-Smtp-Source: AGHT+IHvlOllJMbTzOnkbgUXKktlyAoDPTxYG0eOazyqkaQUC3xnVlb3UC7tIx26d1tFxIAzHZbL8Q== X-Received: by 2002:adf:ce91:0:b0:33a:f85a:6caa with SMTP id r17-20020adfce91000000b0033af85a6caamr1359079wrn.20.1706616720402; Tue, 30 Jan 2024 04:12:00 -0800 (PST) Received: from platypus.localdomain ([62.23.166.218]) by smtp.gmail.com with ESMTPSA id f9-20020a056000036900b00339307d9d31sm10569894wrf.112.2024.01.30.04.12.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Jan 2024 04:12:00 -0800 (PST) From: arthur.cohen@embecosm.com To: gcc-patches@gcc.gnu.org Cc: gcc-rust@gcc.gnu.org, Arthur Cohen Subject: [COMMITTED 101/101] gccrs: Fix output line ending patterns. Date: Tue, 30 Jan 2024 13:07:57 +0100 Message-ID: <20240130121026.807464-104-arthur.cohen@embecosm.com> X-Mailer: git-send-email 2.42.1 In-Reply-To: <20240130121026.807464-2-arthur.cohen@embecosm.com> References: <20240130121026.807464-2-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, 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 X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 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+incoming=patchwork.ozlabs.org@gcc.gnu.org From: Arthur Cohen gcc/testsuite/ChangeLog: * rust/execute/torture/builtin_macros1.rs: Fix output pattern. * rust/execute/torture/coercion3.rs: Likewise. * rust/execute/torture/issue-2080.rs: Likewise. * rust/execute/torture/issue-2179.rs: Likewise. * rust/execute/torture/issue-2180.rs: Likewise. * rust/execute/torture/iter1.rs: Likewise. --- gcc/testsuite/rust/execute/torture/builtin_macros1.rs | 2 +- gcc/testsuite/rust/execute/torture/coercion3.rs | 2 +- gcc/testsuite/rust/execute/torture/issue-2080.rs | 2 +- gcc/testsuite/rust/execute/torture/issue-2179.rs | 2 +- gcc/testsuite/rust/execute/torture/issue-2180.rs | 2 +- gcc/testsuite/rust/execute/torture/iter1.rs | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gcc/testsuite/rust/execute/torture/builtin_macros1.rs b/gcc/testsuite/rust/execute/torture/builtin_macros1.rs index f5dcbd6423c..04d00581897 100644 --- a/gcc/testsuite/rust/execute/torture/builtin_macros1.rs +++ b/gcc/testsuite/rust/execute/torture/builtin_macros1.rs @@ -1,4 +1,4 @@ -// { dg-output "rust/execute/torture/builtin_macros1.rs\r*" } +// { dg-output "rust/execute/torture/builtin_macros1.rs\r*\n" } #![feature(rustc_attrs)] #[rustc_builtin_macro] diff --git a/gcc/testsuite/rust/execute/torture/coercion3.rs b/gcc/testsuite/rust/execute/torture/coercion3.rs index e88338ae2f3..0686056de4e 100644 --- a/gcc/testsuite/rust/execute/torture/coercion3.rs +++ b/gcc/testsuite/rust/execute/torture/coercion3.rs @@ -1,4 +1,4 @@ -// { dg-output "123\n" } +// { dg-output "123\r*\n" } #[lang = "sized"] pub trait Sized {} diff --git a/gcc/testsuite/rust/execute/torture/issue-2080.rs b/gcc/testsuite/rust/execute/torture/issue-2080.rs index dbdbf41ff92..5fdf911efe1 100644 --- a/gcc/testsuite/rust/execute/torture/issue-2080.rs +++ b/gcc/testsuite/rust/execute/torture/issue-2080.rs @@ -1,4 +1,4 @@ -// { dg-output "hello world: gccrs\n" } +// { dg-output "hello world: gccrs\r*\n" } // { dg-additional-options "-w" } static TEST_1: &str = "gccrs"; static TEST_2: i32 = 123; diff --git a/gcc/testsuite/rust/execute/torture/issue-2179.rs b/gcc/testsuite/rust/execute/torture/issue-2179.rs index 86ed11f51c5..8a5ec1bf32e 100644 --- a/gcc/testsuite/rust/execute/torture/issue-2179.rs +++ b/gcc/testsuite/rust/execute/torture/issue-2179.rs @@ -1,4 +1,4 @@ -// { dg-output "123\n" } +// { dg-output "123\r*\n" } #[lang = "sized"] pub trait Sized {} diff --git a/gcc/testsuite/rust/execute/torture/issue-2180.rs b/gcc/testsuite/rust/execute/torture/issue-2180.rs index beed69620a0..6bd71720e48 100644 --- a/gcc/testsuite/rust/execute/torture/issue-2180.rs +++ b/gcc/testsuite/rust/execute/torture/issue-2180.rs @@ -1,4 +1,4 @@ -// { dg-output "123\n" } +// { dg-output "123\r*\n" } #[lang = "sized"] pub trait Sized {} diff --git a/gcc/testsuite/rust/execute/torture/iter1.rs b/gcc/testsuite/rust/execute/torture/iter1.rs index 08f06456e36..c3b6c7bc3f8 100644 --- a/gcc/testsuite/rust/execute/torture/iter1.rs +++ b/gcc/testsuite/rust/execute/torture/iter1.rs @@ -1,4 +1,4 @@ -// { dg-output "1\n2\n" } +// { dg-output "1\r*\n2\r*\n" } #![feature(intrinsics)] pub use option::Option::{self, None, Some};