From 5dd8ed0e88b2ccb32408cecd70fe163065f0f2f2 Mon Sep 17 00:00:00 2001
From: Michael Woerister <michaelwoerister@posteo>
Date: Tue, 7 Aug 2018 12:34:52 +0200
Subject: [PATCH] Re-enable a bunch of debuginfo tests.

---
 .../debuginfo/by-value-non-immediate-argument.rs |  2 +-
 .../debuginfo/function-arg-initialization.rs     |  2 +-
 .../function-prologue-stepping-regular.rs        |  1 -
 src/test/debuginfo/pretty-std.rs                 | 16 ++++++++--------
 4 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/test/debuginfo/by-value-non-immediate-argument.rs b/src/test/debuginfo/by-value-non-immediate-argument.rs
index 9007b44296bcc..86034b221cf12 100644
--- a/src/test/debuginfo/by-value-non-immediate-argument.rs
+++ b/src/test/debuginfo/by-value-non-immediate-argument.rs
@@ -8,8 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// ignore-windows
 // ignore-tidy-linelength
-// ignore-test // Test temporarily ignored due to debuginfo tests being disabled, see PR 47155
 // min-lldb-version: 310
 
 // compile-flags:-g
diff --git a/src/test/debuginfo/function-arg-initialization.rs b/src/test/debuginfo/function-arg-initialization.rs
index 90088a0297aa8..953a468d046de 100644
--- a/src/test/debuginfo/function-arg-initialization.rs
+++ b/src/test/debuginfo/function-arg-initialization.rs
@@ -8,8 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// ignore-windows
 // ignore-tidy-linelength
-// ignore-test // Test temporarily ignored due to debuginfo tests being disabled, see PR 47155
 // min-lldb-version: 310
 
 // This test case checks if function arguments already have the correct value
diff --git a/src/test/debuginfo/function-prologue-stepping-regular.rs b/src/test/debuginfo/function-prologue-stepping-regular.rs
index d50d105e009ff..529a8cd635a92 100644
--- a/src/test/debuginfo/function-prologue-stepping-regular.rs
+++ b/src/test/debuginfo/function-prologue-stepping-regular.rs
@@ -13,7 +13,6 @@
 
 // min-lldb-version: 310
 // ignore-gdb
-// ignore-test // Test temporarily ignored due to debuginfo tests being disabled, see PR 47155
 // compile-flags:-g
 
 // lldb-command:breakpoint set --name immediate_args
diff --git a/src/test/debuginfo/pretty-std.rs b/src/test/debuginfo/pretty-std.rs
index 7bc566480e763..d26e7b8a4c81b 100644
--- a/src/test/debuginfo/pretty-std.rs
+++ b/src/test/debuginfo/pretty-std.rs
@@ -10,7 +10,6 @@
 
 // ignore-windows failing on win32 bot
 // ignore-freebsd: gdb package too new
-// ignore-test // Test temporarily ignored due to debuginfo tests being disabled, see PR 47155
 // ignore-android: FIXME(#10381)
 // compile-flags:-g
 // min-gdb-version 7.7
@@ -40,14 +39,15 @@
 // gdbr-check:$6 = core::option::Option::None
 
 // gdb-command: print os_string
-// gdb-check:$7 = "IAMA OS string 😃"
+// gdb-check:$7 = "IAMA OS string"
 
-// gdb-command: print some_string
-// gdb-check:$8 = Some = {"IAMA optional string!"}
+// Disabled due to https://github.com/rust-lang/rust/issues/53153
+// g d b-command: print some_string
+// g d b-check:$8 = Some = {"IAMA optional string!"}
 
-// gdb-command: set print length 5
-// gdb-command: print some_string
-// gdb-check:$8 = Some = {"IAMA "...}
+// g d b-command: set print length 5
+// g d b-command: print some_string
+// g d b-check:$8 = Some = {"IAMA "...}
 
 
 // === LLDB TESTS ==================================================================================
@@ -92,7 +92,7 @@ fn main() {
     let string = "IAMA string!".to_string();
 
     // OsString
-    let os_string = OsString::from("IAMA OS string \u{1F603}");
+    let os_string = OsString::from("IAMA OS string");
 
     // Option
     let some = Some(8i16);