From 581c1ab730f36bfd5ed0d45862de768cb88b70ac Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Mon, 15 Apr 2019 23:09:14 +0200 Subject: [PATCH] normalize away some Windows-only panic printing --- src/test/ui/proc-macro/invalid-punct-ident-1.rs | 4 ++++ src/test/ui/proc-macro/invalid-punct-ident-1.stderr | 2 +- src/test/ui/proc-macro/invalid-punct-ident-2.rs | 4 ++++ src/test/ui/proc-macro/invalid-punct-ident-2.stderr | 2 +- src/test/ui/proc-macro/invalid-punct-ident-3.rs | 4 ++++ src/test/ui/proc-macro/invalid-punct-ident-3.stderr | 2 +- 6 files changed, 15 insertions(+), 3 deletions(-) diff --git a/src/test/ui/proc-macro/invalid-punct-ident-1.rs b/src/test/ui/proc-macro/invalid-punct-ident-1.rs index 2360b1fe8c0fc..1647028f704b6 100644 --- a/src/test/ui/proc-macro/invalid-punct-ident-1.rs +++ b/src/test/ui/proc-macro/invalid-punct-ident-1.rs @@ -1,5 +1,9 @@ // aux-build:invalid-punct-ident.rs +// FIXME https://github.com/rust-lang/rust/issues/59998 +// normalize-stderr-windows "thread.*panicked.*proc_macro_server.rs.*\n" -> "" +// normalize-stderr-windows "note:.*RUST_BACKTRACE=1.*\n" -> "" + #[macro_use] extern crate invalid_punct_ident; diff --git a/src/test/ui/proc-macro/invalid-punct-ident-1.stderr b/src/test/ui/proc-macro/invalid-punct-ident-1.stderr index 9a53741f94f96..40333a3f4c211 100644 --- a/src/test/ui/proc-macro/invalid-punct-ident-1.stderr +++ b/src/test/ui/proc-macro/invalid-punct-ident-1.stderr @@ -1,5 +1,5 @@ error: proc macro panicked - --> $DIR/invalid-punct-ident-1.rs:6:1 + --> $DIR/invalid-punct-ident-1.rs:10:1 | LL | invalid_punct!(); | ^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/proc-macro/invalid-punct-ident-2.rs b/src/test/ui/proc-macro/invalid-punct-ident-2.rs index 9593d47bb13b0..c78b7a8735e34 100644 --- a/src/test/ui/proc-macro/invalid-punct-ident-2.rs +++ b/src/test/ui/proc-macro/invalid-punct-ident-2.rs @@ -1,5 +1,9 @@ // aux-build:invalid-punct-ident.rs +// FIXME https://github.com/rust-lang/rust/issues/59998 +// normalize-stderr-windows "thread.*panicked.*proc_macro_server.rs.*\n" -> "" +// normalize-stderr-windows "note:.*RUST_BACKTRACE=1.*\n" -> "" + #[macro_use] extern crate invalid_punct_ident; diff --git a/src/test/ui/proc-macro/invalid-punct-ident-2.stderr b/src/test/ui/proc-macro/invalid-punct-ident-2.stderr index 77a26b830d98f..ec97e265c3fcd 100644 --- a/src/test/ui/proc-macro/invalid-punct-ident-2.stderr +++ b/src/test/ui/proc-macro/invalid-punct-ident-2.stderr @@ -1,5 +1,5 @@ error: proc macro panicked - --> $DIR/invalid-punct-ident-2.rs:6:1 + --> $DIR/invalid-punct-ident-2.rs:10:1 | LL | invalid_ident!(); | ^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/proc-macro/invalid-punct-ident-3.rs b/src/test/ui/proc-macro/invalid-punct-ident-3.rs index 75e3e06f881f3..3638ad970996a 100644 --- a/src/test/ui/proc-macro/invalid-punct-ident-3.rs +++ b/src/test/ui/proc-macro/invalid-punct-ident-3.rs @@ -1,5 +1,9 @@ // aux-build:invalid-punct-ident.rs +// FIXME https://github.com/rust-lang/rust/issues/59998 +// normalize-stderr-windows "thread.*panicked.*proc_macro_server.rs.*\n" -> "" +// normalize-stderr-windows "note:.*RUST_BACKTRACE=1.*\n" -> "" + #[macro_use] extern crate invalid_punct_ident; diff --git a/src/test/ui/proc-macro/invalid-punct-ident-3.stderr b/src/test/ui/proc-macro/invalid-punct-ident-3.stderr index 24371f3a2a6db..a5e5ded65333a 100644 --- a/src/test/ui/proc-macro/invalid-punct-ident-3.stderr +++ b/src/test/ui/proc-macro/invalid-punct-ident-3.stderr @@ -1,5 +1,5 @@ error: proc macro panicked - --> $DIR/invalid-punct-ident-3.rs:6:1 + --> $DIR/invalid-punct-ident-3.rs:10:1 | LL | invalid_raw_ident!(); | ^^^^^^^^^^^^^^^^^^^^^