https://gcc.gnu.org/g:ca3a03dd74c0f0300597bca257f7e0f6250fc57b commit ca3a03dd74c0f0300597bca257f7e0f6250fc57b Author: liushuyu <liushuyu011@gmail.com> 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" "" }