From 39d144e8087cdbe5abb94d2538ad74120181c0d0 Mon Sep 17 00:00:00 2001
From: Vadim Petrochenkov <vadim.petrochenkov@gmail.com>
Date: Fri, 19 Jul 2019 14:03:22 +0300
Subject: [PATCH] Fix or ignore regressed tests

---
 src/test/run-pass/backtrace-debuginfo.rs                     | 3 ++-
 src/test/run-pass/backtrace.rs                               | 1 +
 src/test/run-pass/command-uid-gid.rs                         | 5 +++++
 src/test/run-pass/generator/size-moved-locals.rs             | 1 +
 .../issues}/issue-58375-monomorphize-default-impls.rs        | 5 +++--
 5 files changed, 12 insertions(+), 3 deletions(-)
 rename src/test/{run-pass => ui/issues}/issue-58375-monomorphize-default-impls.rs (85%)

diff --git a/src/test/run-pass/backtrace-debuginfo.rs b/src/test/run-pass/backtrace-debuginfo.rs
index 69ce1f70322..a2a934513d2 100644
--- a/src/test/run-pass/backtrace-debuginfo.rs
+++ b/src/test/run-pass/backtrace-debuginfo.rs
@@ -10,8 +10,9 @@
 // ignore-pretty issue #37195
 // ignore-cloudabi spawning processes is not supported
 // ignore-emscripten spawning processes is not supported
-// normalize-stderr-test ".*\n" -> ""
+// ignore-msvc issue #62844
 // ignore-sgx no processes
+// normalize-stderr-test ".*\n" -> ""
 
 // Note that above `-opt-bisect-limit=0` is used to basically disable
 // optimizations. It creates tons of output on stderr, hence we normalize
diff --git a/src/test/run-pass/backtrace.rs b/src/test/run-pass/backtrace.rs
index c73ba293ee2..93e8c9f1729 100644
--- a/src/test/run-pass/backtrace.rs
+++ b/src/test/run-pass/backtrace.rs
@@ -2,6 +2,7 @@
 // ignore-cloudabi spawning processes is not supported
 // ignore-emscripten spawning processes is not supported
 // ignore-openbsd no support for libbacktrace without filename
+// ignore-msvc issue #62844
 // ignore-sgx no processes
 // compile-flags:-g
 
diff --git a/src/test/run-pass/command-uid-gid.rs b/src/test/run-pass/command-uid-gid.rs
index 2b52c5d104c..5f4b3941d90 100644
--- a/src/test/run-pass/command-uid-gid.rs
+++ b/src/test/run-pass/command-uid-gid.rs
@@ -1,3 +1,8 @@
+// ignore-android
+// ignore-cloudabi
+// ignore-emscripten
+// ignore-sgx
+
 #![feature(rustc_private)]
 
 fn main() {
diff --git a/src/test/run-pass/generator/size-moved-locals.rs b/src/test/run-pass/generator/size-moved-locals.rs
index 37e2e0cfdcc..574442e2574 100644
--- a/src/test/run-pass/generator/size-moved-locals.rs
+++ b/src/test/run-pass/generator/size-moved-locals.rs
@@ -9,6 +9,7 @@
 // See issue #59123 for a full explanation.
 
 // edition:2018
+// ignore-wasm32 issue #62807
 
 #![feature(generators, generator_trait)]
 
diff --git a/src/test/run-pass/issue-58375-monomorphize-default-impls.rs b/src/test/ui/issues/issue-58375-monomorphize-default-impls.rs
similarity index 85%
rename from src/test/run-pass/issue-58375-monomorphize-default-impls.rs
rename to src/test/ui/issues/issue-58375-monomorphize-default-impls.rs
index 6730217626f..6da6f398dfc 100644
--- a/src/test/run-pass/issue-58375-monomorphize-default-impls.rs
+++ b/src/test/ui/issues/issue-58375-monomorphize-default-impls.rs
@@ -1,6 +1,8 @@
 // Make sure that the mono-item collector does not crash when trying to
 // instantiate a default impl for DecodeUtf16<<u8 as A>::Item>
 // See https://github.com/rust-lang/rust/issues/58375
+
+// build-pass
 // compile-flags:-C link-dead-code
 
 #![crate_type = "rlib"]
@@ -19,5 +21,4 @@ impl A for u8 {
     type Item = char;
 }
 
-impl Arbitrary for DecodeUtf16<<u8 as A>::Item>  {
-}
+impl Arbitrary for DecodeUtf16<<u8 as A>::Item> {}