Clean tests

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 d2c313ddd0cd45a29eddfe12487014c81ef1a039..4a046e424c528a88f2e859135ddae10ce763d10b 100644 (file)
--- 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 51518481941df8621bf13af3f32d644e6c7e78b2..be2c2607002e06176e69a2bcd5471fc23224c3dc 100644 (file)
--- 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 ddff608181e93ae77b41a970ab8c3f3a8934872e..ec281a19b17d00770f11572b22721e76fadf86f1 100644 (file)
--- 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 a00d98bf7fd9b3e830435a3bc2d79d646ff23275..8c53ee874c46695bdc67823dd2dd8645ba41f32a 100644 (file)
--- 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 e2eb449f977ce201c8e977bc1202cf4f23bcf2d0..d1970877574f8adf265efeeb75f02c6c3e135f13 100644 (file)
--- 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 5d74e115ef87fb9a8033623264df0bc22a7c4b0d..1885c930e9a2b79e502ec492dee0539f91bf81a6 100644 (file)
--- 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 dca58fb2555a8b4e12e47d0e0036897d177ec534..2ee0fdfc1ec6b84adb36e7f8253eb2a214f24767 100644 (file)
--- 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 1ea31ec8deb6acb3723d906de2ef71f1f69f6ead..1d0173ed332722c00be5f6ca5b1bfd55aa700f02 100644 (file)
--- 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 2a3d79b76c306bec7bd488083fcc27bd85f64a8d..146b8ce6a130a8461b1cb7c9e96c144a7fa387df 100644 (file)
--- 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 38d378226301084a85c5cb2c6d9ebc2222d05231..6223f308c2f35040e76d3ddda7ff7318c13734f9 100644 (file)
--- 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