public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
From: Thomas Schwinge <tschwinge@gcc.gnu.org>
To: gcc-cvs@gcc.gnu.org
Subject: [gcc/devel/rust/master] Merge #1732
Date: Fri, 20 Jan 2023 16:53:11 +0000 (GMT) [thread overview]
Message-ID: <20230120165311.A18773857803@sourceware.org> (raw)
https://gcc.gnu.org/g:01c232573e8d9d9fac47ebfee8459e3b493ce278
commit 01c232573e8d9d9fac47ebfee8459e3b493ce278
Merge: 7c84b3c02a8 22343f79c0d
Author: bors[bot] <26634292+bors[bot]@users.noreply.github.com>
Date: Fri Jan 20 08:36:23 2023 +0000
Merge #1732
1732: testsuite: Handle Windows carriage returns properly r=CohenArthur a=CohenArthur
In dg-output, check for \r* carriage returns to make sure execution tests pass on windows platforms
gcc/testsuite/ChangeLog:
* rust/execute/torture/builtin_macro_cfg.rs: Handle carriage returns properly
* rust/execute/torture/builtin_macro_concat.rs: Handle carriage returns properly
* rust/execute/torture/builtin_macro_env.rs: Handle carriage returns properly
* rust/execute/torture/builtin_macro_include_bytes.rs: Handle carriage returns properly
* rust/execute/torture/builtin_macro_include_str.rs: Handle carriage returns properly
* rust/execute/torture/builtin_macro_line.rs: Handle carriage returns properly
* rust/execute/torture/builtin_macros1.rs: Handle carriage returns properly
* rust/execute/torture/builtin_macros3.rs: Handle carriage returns properly
* rust/execute/torture/cfg1.rs: Handle carriage returns properly
* rust/execute/torture/cfg2.rs: Handle carriage returns properly
* rust/execute/torture/cfg3.rs: Handle carriage returns properly
* rust/execute/torture/cfg4.rs: Handle carriage returns properly
* rust/execute/torture/coercion1.rs: Handle carriage returns properly
* rust/execute/torture/coercion2.rs: Handle carriage returns properly
* rust/execute/torture/extern_mod4.rs: Handle carriage returns properly
* rust/execute/torture/helloworld1.rs: Handle carriage returns properly
* rust/execute/torture/helloworld2.rs: Handle carriage returns properly
* rust/execute/torture/issue-1198.rs: Handle carriage returns properly
* rust/execute/torture/issue-1231.rs: Handle carriage returns properly
* rust/execute/torture/issue-1232.rs: Handle carriage returns properly
* rust/execute/torture/issue-1249.rs: Handle carriage returns properly
* rust/execute/torture/issue-1436.rs: Handle carriage returns properly
* rust/execute/torture/issue-1496.rs: Handle carriage returns properly
* rust/execute/torture/issue-647.rs: Handle carriage returns properly
* rust/execute/torture/issue-845.rs: Handle carriage returns properly
* rust/execute/torture/issue-851.rs: Handle carriage returns properly
* rust/execute/torture/issue-858.rs: Handle carriage returns properly
* rust/execute/torture/issue-976.rs: Handle carriage returns properly
* rust/execute/torture/macros10.rs: Handle carriage returns properly
* rust/execute/torture/macros11.rs: Handle carriage returns properly
* rust/execute/torture/macros12.rs: Handle carriage returns properly
* rust/execute/torture/macros13.rs: Handle carriage returns properly
* rust/execute/torture/macros14.rs: Handle carriage returns properly
* rust/execute/torture/macros2.rs: Handle carriage returns properly
* rust/execute/torture/macros22.rs: Handle carriage returns properly
* rust/execute/torture/macros29.rs: Handle carriage returns properly
* rust/execute/torture/macros3.rs: Handle carriage returns properly
* rust/execute/torture/macros30.rs: Handle carriage returns properly
* rust/execute/torture/macros31.rs: Handle carriage returns properly
* rust/execute/torture/macros7.rs: Handle carriage returns properly
* rust/execute/torture/macros8.rs: Handle carriage returns properly
* rust/execute/torture/macros9.rs: Handle carriage returns properly
* rust/execute/torture/match1.rs: Handle carriage returns properly
* rust/execute/torture/match2.rs: Handle carriage returns properly
* rust/execute/torture/match3.rs: Handle carriage returns properly
* rust/execute/torture/match_bool1.rs: Handle carriage returns properly
* rust/execute/torture/match_byte1.rs: Handle carriage returns properly
* rust/execute/torture/match_char1.rs: Handle carriage returns properly
* rust/execute/torture/match_int1.rs: Handle carriage returns properly
* rust/execute/torture/match_loop1.rs: Handle carriage returns properly
* rust/execute/torture/match_range1.rs: Handle carriage returns properly
* rust/execute/torture/match_range2.rs: Handle carriage returns properly
* rust/execute/torture/match_tuple1.rs: Handle carriage returns properly
* rust/execute/torture/method1.rs: Handle carriage returns properly
* rust/execute/torture/method2.rs: Handle carriage returns properly
* rust/execute/torture/method3.rs: Handle carriage returns properly
* rust/execute/torture/method4.rs: Handle carriage returns properly
* rust/execute/torture/operator_overload_1.rs: Handle carriage returns properly
* rust/execute/torture/operator_overload_10.rs: Handle carriage returns properly
* rust/execute/torture/operator_overload_11.rs: Handle carriage returns properly
* rust/execute/torture/operator_overload_12.rs: Handle carriage returns properly
* rust/execute/torture/operator_overload_2.rs: Handle carriage returns properly
* rust/execute/torture/operator_overload_4.rs: Handle carriage returns properly
* rust/execute/torture/operator_overload_5.rs: Handle carriage returns properly
* rust/execute/torture/operator_overload_6.rs: Handle carriage returns properly
* rust/execute/torture/operator_overload_7.rs: Handle carriage returns properly
* rust/execute/torture/operator_overload_8.rs: Handle carriage returns properly
* rust/execute/torture/operator_overload_9.rs: Handle carriage returns properly
* rust/execute/torture/str-layout1.rs: Handle carriage returns properly
* rust/execute/torture/str-zero.rs: Handle carriage returns properly
* rust/execute/torture/trait1.rs: Handle carriage returns properly
* rust/execute/torture/trait10.rs: Handle carriage returns properly
* rust/execute/torture/trait11.rs: Handle carriage returns properly
* rust/execute/torture/trait12.rs: Handle carriage returns properly
* rust/execute/torture/trait13.rs: Handle carriage returns properly
* rust/execute/torture/trait2.rs: Handle carriage returns properly
* rust/execute/torture/trait3.rs: Handle carriage returns properly
* rust/execute/torture/trait4.rs: Handle carriage returns properly
* rust/execute/torture/trait5.rs: Handle carriage returns properly
* rust/execute/torture/trait6.rs: Handle carriage returns properly
* rust/execute/torture/trait7.rs: Handle carriage returns properly
* rust/execute/torture/trait8.rs: Handle carriage returns properly
* rust/execute/torture/trait9.rs: Handle carriage returns properly
Co-authored-by: Arthur Cohen <arthur.cohen@embecosm.com>
Diff:
.../rust/execute/torture/builtin_macro_cfg.rs | 8 +++---
.../rust/execute/torture/builtin_macro_concat.rs | 2 +-
.../rust/execute/torture/builtin_macro_env.rs | 2 +-
.../execute/torture/builtin_macro_include_bytes.rs | 2 +-
.../execute/torture/builtin_macro_include_str.rs | 2 +-
.../rust/execute/torture/builtin_macro_line.rs | 2 +-
.../rust/execute/torture/builtin_macros1.rs | 2 +-
.../rust/execute/torture/builtin_macros3.rs | 5 ++--
gcc/testsuite/rust/execute/torture/cfg1.rs | 2 +-
gcc/testsuite/rust/execute/torture/cfg2.rs | 2 +-
gcc/testsuite/rust/execute/torture/cfg3.rs | 2 +-
gcc/testsuite/rust/execute/torture/cfg4.rs | 2 +-
gcc/testsuite/rust/execute/torture/closure2.rs | 2 +-
gcc/testsuite/rust/execute/torture/closure3.rs | 2 +-
gcc/testsuite/rust/execute/torture/coercion1.rs | 2 +-
gcc/testsuite/rust/execute/torture/coercion2.rs | 2 +-
gcc/testsuite/rust/execute/torture/extern_mod4.rs | 2 +-
gcc/testsuite/rust/execute/torture/helloworld1.rs | 2 +-
gcc/testsuite/rust/execute/torture/helloworld2.rs | 2 +-
gcc/testsuite/rust/execute/torture/issue-1198.rs | 2 +-
gcc/testsuite/rust/execute/torture/issue-1231.rs | 2 +-
gcc/testsuite/rust/execute/torture/issue-1232.rs | 2 +-
gcc/testsuite/rust/execute/torture/issue-1249.rs | 2 +-
gcc/testsuite/rust/execute/torture/issue-1436.rs | 1 -
gcc/testsuite/rust/execute/torture/issue-1496.rs | 2 +-
gcc/testsuite/rust/execute/torture/issue-647.rs | 2 +-
gcc/testsuite/rust/execute/torture/issue-845.rs | 2 +-
gcc/testsuite/rust/execute/torture/issue-851.rs | 2 +-
gcc/testsuite/rust/execute/torture/issue-858.rs | 2 +-
gcc/testsuite/rust/execute/torture/issue-976.rs | 2 +-
.../rust/execute/torture/loop-condition-eval.rs | 2 +-
gcc/testsuite/rust/execute/torture/macros10.rs | 2 +-
gcc/testsuite/rust/execute/torture/macros11.rs | 2 +-
gcc/testsuite/rust/execute/torture/macros12.rs | 2 +-
gcc/testsuite/rust/execute/torture/macros13.rs | 2 +-
gcc/testsuite/rust/execute/torture/macros14.rs | 2 +-
gcc/testsuite/rust/execute/torture/macros2.rs | 2 +-
gcc/testsuite/rust/execute/torture/macros22.rs | 2 +-
gcc/testsuite/rust/execute/torture/macros29.rs | 2 +-
gcc/testsuite/rust/execute/torture/macros3.rs | 2 +-
gcc/testsuite/rust/execute/torture/macros30.rs | 2 +-
gcc/testsuite/rust/execute/torture/macros31.rs | 2 +-
gcc/testsuite/rust/execute/torture/macros7.rs | 2 +-
gcc/testsuite/rust/execute/torture/macros8.rs | 2 +-
gcc/testsuite/rust/execute/torture/macros9.rs | 2 +-
gcc/testsuite/rust/execute/torture/match1.rs | 2 +-
gcc/testsuite/rust/execute/torture/match2.rs | 2 +-
gcc/testsuite/rust/execute/torture/match3.rs | 2 +-
gcc/testsuite/rust/execute/torture/match_bool1.rs | 2 +-
gcc/testsuite/rust/execute/torture/match_byte1.rs | 2 +-
gcc/testsuite/rust/execute/torture/match_char1.rs | 2 +-
gcc/testsuite/rust/execute/torture/match_int1.rs | 2 +-
gcc/testsuite/rust/execute/torture/match_loop1.rs | 2 +-
gcc/testsuite/rust/execute/torture/match_range1.rs | 2 +-
gcc/testsuite/rust/execute/torture/match_range2.rs | 2 +-
gcc/testsuite/rust/execute/torture/match_tuple1.rs | 2 +-
gcc/testsuite/rust/execute/torture/method1.rs | 2 +-
gcc/testsuite/rust/execute/torture/method2.rs | 2 +-
gcc/testsuite/rust/execute/torture/method3.rs | 2 +-
gcc/testsuite/rust/execute/torture/method4.rs | 2 +-
.../rust/execute/torture/operator_overload_1.rs | 2 +-
.../rust/execute/torture/operator_overload_10.rs | 2 +-
.../rust/execute/torture/operator_overload_11.rs | 2 +-
.../rust/execute/torture/operator_overload_12.rs | 2 +-
.../rust/execute/torture/operator_overload_2.rs | 2 +-
.../rust/execute/torture/operator_overload_3.rs | 2 +-
.../rust/execute/torture/operator_overload_4.rs | 2 +-
.../rust/execute/torture/operator_overload_5.rs | 2 +-
.../rust/execute/torture/operator_overload_6.rs | 2 +-
.../rust/execute/torture/operator_overload_7.rs | 2 +-
.../rust/execute/torture/operator_overload_8.rs | 2 +-
.../rust/execute/torture/operator_overload_9.rs | 2 +-
gcc/testsuite/rust/execute/torture/str-layout1.rs | 2 +-
gcc/testsuite/rust/execute/torture/str-zero.rs | 33 ++++++++++------------
gcc/testsuite/rust/execute/torture/trait1.rs | 2 +-
gcc/testsuite/rust/execute/torture/trait10.rs | 2 +-
gcc/testsuite/rust/execute/torture/trait11.rs | 2 +-
gcc/testsuite/rust/execute/torture/trait12.rs | 2 +-
gcc/testsuite/rust/execute/torture/trait13.rs | 2 +-
gcc/testsuite/rust/execute/torture/trait2.rs | 2 +-
gcc/testsuite/rust/execute/torture/trait3.rs | 2 +-
gcc/testsuite/rust/execute/torture/trait4.rs | 2 +-
gcc/testsuite/rust/execute/torture/trait5.rs | 2 +-
gcc/testsuite/rust/execute/torture/trait6.rs | 2 +-
gcc/testsuite/rust/execute/torture/trait7.rs | 2 +-
gcc/testsuite/rust/execute/torture/trait8.rs | 2 +-
gcc/testsuite/rust/execute/torture/trait9.rs | 2 +-
87 files changed, 104 insertions(+), 109 deletions(-)
reply other threads:[~2023-01-20 16:53 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230120165311.A18773857803@sourceware.org \
--to=tschwinge@gcc.gnu.org \
--cc=gcc-cvs@gcc.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).