Clean tests

10 files changed, 31 insertions, 11 deletions

diff --git a/src/test/ui/consts/const-eval/simd/extract-fail0.rs b/src/test/ui/consts/const-eval/simd/extract-fail0.rs
index d2c313ddd0c..4a046e424c5 100644
--- a/src/test/ui/consts/const-eval/simd/extract-fail0.rs
+++ b/src/test/ui/consts/const-eval/simd/extract-fail0.rs
@@ -1,5 +1,9 @@
 // failure-status: 101
 // rustc-env:RUST_BACKTRACE=0
+// normalize-stderr-test "note: rustc 1.* running on .*" -> "note: rustc VERSION running on TARGET"
+// normalize-stderr-test "note: compiler flags: .*" -> "note: compiler flags: FLAGS"
+// normalize-stderr-test "interpret/intern.rs:[0-9]*:[0-9]*" -> "interpret/intern.rs:LL:CC"
+
 #![feature(const_fn)]
 #![feature(repr_simd)]
 #![feature(platform_intrinsics)]
diff --git a/src/test/ui/consts/const-eval/simd/extract-fail0.stderr b/src/test/ui/consts/const-eval/simd/extract-fail0.stderr
index 51518481941..be2c2607002 100644
--- a/src/test/ui/consts/const-eval/simd/extract-fail0.stderr
+++ b/src/test/ui/consts/const-eval/simd/extract-fail0.stderr
@@ -9,7 +9,7 @@ note: the compiler unexpectedly panicked. this is a bug.
 
 note: we would appreciate a bug report: https://github.com/rust-lang/rust/blob/master/CONTRIBUTING.md#bug-reports
 
-note: rustc 1.39.0-dev running on x86_64-apple-darwin
+note: rustc VERSION running on TARGET
 
-note: compiler flags: -Z threads=1 -Z ui-testing -Z unstable-options -C prefer-dynamic -C rpath -C debuginfo=0
+note: compiler flags: FLAGS
 
diff --git a/src/test/ui/consts/const-eval/simd/extract-fail1.rs b/src/test/ui/consts/const-eval/simd/extract-fail1.rs
index ddff608181e..ec281a19b17 100644
--- a/src/test/ui/consts/const-eval/simd/extract-fail1.rs
+++ b/src/test/ui/consts/const-eval/simd/extract-fail1.rs
@@ -1,5 +1,9 @@
 // failure-status: 101
 // rustc-env:RUST_BACKTRACE=0
+// normalize-stderr-test "note: rustc 1.* running on .*" -> "note: rustc VERSION running on TARGET"
+// normalize-stderr-test "note: compiler flags: .*" -> "note: compiler flags: FLAGS"
+// normalize-stderr-test "interpret/intern.rs:[0-9]*:[0-9]*" -> "interpret/intern.rs:LL:CC"
+
 #![feature(const_fn)]
 #![feature(repr_simd)]
 #![feature(platform_intrinsics)]
diff --git a/src/test/ui/consts/const-eval/simd/extract-fail1.stderr b/src/test/ui/consts/const-eval/simd/extract-fail1.stderr
index a00d98bf7fd..8c53ee874c4 100644
--- a/src/test/ui/consts/const-eval/simd/extract-fail1.stderr
+++ b/src/test/ui/consts/const-eval/simd/extract-fail1.stderr
@@ -1,4 +1,4 @@
-error: internal compiler error: src/librustc_mir/interpret/operand.rs:346: Type `i8` is not a SIMD vector type
+error: internal compiler error: src/librustc_mir/interpret/operand.rs:345: Type `i8` is not a SIMD vector type
 
 thread 'rustc' panicked at 'Box<Any>', src/librustc_errors/lib.rs:643:9
 note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace.
@@ -7,9 +7,9 @@ note: the compiler unexpectedly panicked. this is a bug.
 
 note: we would appreciate a bug report: https://github.com/rust-lang/rust/blob/master/CONTRIBUTING.md#bug-reports
 
-note: rustc 1.39.0-dev running on x86_64-apple-darwin
+note: rustc VERSION running on TARGET
 
-note: compiler flags: -Z threads=1 -Z ui-testing -Z unstable-options -C prefer-dynamic -C rpath -C debuginfo=0
+note: compiler flags: FLAGS
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/consts/const-eval/simd/extract-fail2.rs b/src/test/ui/consts/const-eval/simd/extract-fail2.rs
index e2eb449f977..d1970877574 100644
--- a/src/test/ui/consts/const-eval/simd/extract-fail2.rs
+++ b/src/test/ui/consts/const-eval/simd/extract-fail2.rs
@@ -1,5 +1,9 @@
 // failure-status: 101
 // rustc-env:RUST_BACKTRACE=0
+// normalize-stderr-test "note: rustc 1.* running on .*" -> "note: rustc VERSION running on TARGET"
+// normalize-stderr-test "note: compiler flags: .*" -> "note: compiler flags: FLAGS"
+// normalize-stderr-test "interpret/intern.rs:[0-9]*:[0-9]*" -> "interpret/intern.rs:LL:CC"
+
 #![feature(const_fn)]
 #![feature(repr_simd)]
 #![feature(platform_intrinsics)]
diff --git a/src/test/ui/consts/const-eval/simd/extract-fail2.stderr b/src/test/ui/consts/const-eval/simd/extract-fail2.stderr
index 5d74e115ef8..1885c930e9a 100644
--- a/src/test/ui/consts/const-eval/simd/extract-fail2.stderr
+++ b/src/test/ui/consts/const-eval/simd/extract-fail2.stderr
@@ -7,7 +7,7 @@ note: the compiler unexpectedly panicked. this is a bug.
 
 note: we would appreciate a bug report: https://github.com/rust-lang/rust/blob/master/CONTRIBUTING.md#bug-reports
 
-note: rustc 1.39.0-dev running on x86_64-apple-darwin
+note: rustc VERSION running on TARGET
 
-note: compiler flags: -Z threads=1 -Z ui-testing -Z unstable-options -C prefer-dynamic -C rpath -C debuginfo=0
+note: compiler flags: FLAGS
 
diff --git a/src/test/ui/consts/const-eval/simd/insert-fail0.rs b/src/test/ui/consts/const-eval/simd/insert-fail0.rs
index dca58fb2555..2ee0fdfc1ec 100644
--- a/src/test/ui/consts/const-eval/simd/insert-fail0.rs
+++ b/src/test/ui/consts/const-eval/simd/insert-fail0.rs
@@ -1,5 +1,9 @@
 // failure-status: 101
 // rustc-env:RUST_BACKTRACE=0
+// normalize-stderr-test "note: rustc 1.* running on .*" -> "note: rustc VERSION running on TARGET"
+// normalize-stderr-test "note: compiler flags: .*" -> "note: compiler flags: FLAGS"
+// normalize-stderr-test "interpret/intern.rs:[0-9]*:[0-9]*" -> "interpret/intern.rs:LL:CC"
+
 #![feature(const_fn)]
 #![feature(repr_simd)]
 #![feature(platform_intrinsics)]
diff --git a/src/test/ui/consts/const-eval/simd/insert-fail0.stderr b/src/test/ui/consts/const-eval/simd/insert-fail0.stderr
index 1ea31ec8deb..1d0173ed332 100644
--- a/src/test/ui/consts/const-eval/simd/insert-fail0.stderr
+++ b/src/test/ui/consts/const-eval/simd/insert-fail0.stderr
@@ -9,7 +9,7 @@ note: the compiler unexpectedly panicked. this is a bug.
 
 note: we would appreciate a bug report: https://github.com/rust-lang/rust/blob/master/CONTRIBUTING.md#bug-reports
 
-note: rustc 1.39.0-dev running on x86_64-apple-darwin
+note: rustc VERSION running on TARGET
 
-note: compiler flags: -Z threads=1 -Z ui-testing -Z unstable-options -C prefer-dynamic -C rpath -C debuginfo=0
+note: compiler flags: FLAGS
 
diff --git a/src/test/ui/consts/const-eval/simd/insert-fail1.rs b/src/test/ui/consts/const-eval/simd/insert-fail1.rs
index 2a3d79b76c3..146b8ce6a13 100644
--- a/src/test/ui/consts/const-eval/simd/insert-fail1.rs
+++ b/src/test/ui/consts/const-eval/simd/insert-fail1.rs
@@ -1,5 +1,9 @@
 // failure-status: 101
 // rustc-env:RUST_BACKTRACE=0
+// normalize-stderr-test "note: rustc 1.* running on .*" -> "note: rustc VERSION running on TARGET"
+// normalize-stderr-test "note: compiler flags: .*" -> "note: compiler flags: FLAGS"
+// normalize-stderr-test "interpret/intern.rs:[0-9]*:[0-9]*" -> "interpret/intern.rs:LL:CC"
+
 #![feature(const_fn)]
 #![feature(repr_simd)]
 #![feature(platform_intrinsics)]
diff --git a/src/test/ui/consts/const-eval/simd/insert-fail1.stderr b/src/test/ui/consts/const-eval/simd/insert-fail1.stderr
index 38d37822630..6223f308c2f 100644
--- a/src/test/ui/consts/const-eval/simd/insert-fail1.stderr
+++ b/src/test/ui/consts/const-eval/simd/insert-fail1.stderr
@@ -7,7 +7,7 @@ note: the compiler unexpectedly panicked. this is a bug.
 
 note: we would appreciate a bug report: https://github.com/rust-lang/rust/blob/master/CONTRIBUTING.md#bug-reports
 
-note: rustc 1.39.0-dev running on x86_64-apple-darwin
+note: rustc VERSION running on TARGET
 
-note: compiler flags: -Z threads=1 -Z ui-testing -Z unstable-options -C prefer-dynamic -C rpath -C debuginfo=0
+note: compiler flags: FLAGS