From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1643) id 0FD4E38582A7; Tue, 27 Sep 2022 08:23:27 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 0FD4E38582A7 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1664267007; bh=I9TGbNDBWsG2vtCikIyG2gf4yuvAPDprFj1idZieSMU=; h=From:To:Subject:Date:From; b=y4kttd2CkQyu58ph2K0SHePdAlmV9KSFqTNYk3Ez3NxEVlwdi4YT46rRdYDFvwAGu Mv6LqKhVowxBnSUt649SkMX64BCW7cFVqXyRKIfHDEldw8bi5d0oBT/d6wOf1cn64a m5gvC9eEVeuAOxqO8B4Mbwm/UDkdv1Lk1DwP0rqs= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Thomas Schwinge To: gcc-cvs@gcc.gnu.org Subject: [gcc/devel/rust/master] testsuite: adapt existing testcases X-Act-Checkin: gcc X-Git-Author: liushuyu X-Git-Refname: refs/heads/devel/rust/master X-Git-Oldrev: a16c35340c833ed25035c664ee33551d17309601 X-Git-Newrev: ca3a03dd74c0f0300597bca257f7e0f6250fc57b Message-Id: <20220927082327.0FD4E38582A7@sourceware.org> Date: Tue, 27 Sep 2022 08:23:27 +0000 (GMT) List-Id: https://gcc.gnu.org/g:ca3a03dd74c0f0300597bca257f7e0f6250fc57b commit ca3a03dd74c0f0300597bca257f7e0f6250fc57b Author: liushuyu Date: Fri Sep 2 23:13:21 2022 -0600 testsuite: adapt existing testcases Diff: --- gcc/testsuite/rust/compile/builtin_macro_concat.rs | 1 - gcc/testsuite/rust/compile/builtin_macro_env.rs | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/gcc/testsuite/rust/compile/builtin_macro_concat.rs b/gcc/testsuite/rust/compile/builtin_macro_concat.rs index 8a84934f949..3b8eb2dcda7 100644 --- a/gcc/testsuite/rust/compile/builtin_macro_concat.rs +++ b/gcc/testsuite/rust/compile/builtin_macro_concat.rs @@ -14,5 +14,4 @@ fn main() { concat!("message", 1, true, false, 1.0, 10usize, 2000u64,); concat! ("m", not_literal); // { dg-error "expected a literal" } concat!(not_literal invalid 'm' !!,); // { dg-error "expected token: .,." } - // { dg-error "expected a literal" "" { target *-*-* } .-1 } } diff --git a/gcc/testsuite/rust/compile/builtin_macro_env.rs b/gcc/testsuite/rust/compile/builtin_macro_env.rs index 289e6db2cf1..337f0ae4316 100644 --- a/gcc/testsuite/rust/compile/builtin_macro_env.rs +++ b/gcc/testsuite/rust/compile/builtin_macro_env.rs @@ -7,13 +7,13 @@ fn main () { let message = "error message"; env! (message); // { dg-error "argument must be a string literal" "" } env! (); // { dg-error "env! takes 1 or 2 arguments" "" } - env! (,); // { dg-error "argument must be a string literal" "" } + env! (,); // { dg-error "expected expression, found .,." "" } env! (1); // { dg-error "argument must be a string literal" "" } env! ("NOT_DEFINED"); // { dg-error "environment variable 'NOT_DEFINED' not defined" "" } env! ("NOT_DEFINED",); // { dg-error "environment variable 'NOT_DEFINED' not defined" "" } env! ("NOT_DEFINED", 1); // { dg-error "argument must be a string literal" "" } env! ("NOT_DEFINED", "two", "three"); // { dg-error "env! takes 1 or 2 arguments" "" } - env! ("NOT_DEFINED" "expected error message"); // { dg-error "expected token: ','" "" } + env! ("NOT_DEFINED" "expected error message"); // { dg-error "expected token: .,." "" } env! ("NOT_DEFINED", "expected error message"); // { dg-error "expected error message" "" } env! ("NOT_DEFINED", "expected error message",); // { dg-error "expected error message" "" } env! (1, "two"); // { dg-error "argument must be a string literal" "" }