From e053571df21fda7bb909c1b79de9b0cbe1a2931d Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Tue, 14 Apr 2015 14:37:14 -0700
Subject: [PATCH] Test fixes and rebase conflicts, round 2

---
 src/test/debuginfo/function-prologue-stepping-regular.rs | 3 +--
 src/test/{run-pass => run-pass-fulldeps}/issue-15149.rs  | 1 +
 src/test/run-pass/drop-flag-skip-sanity-check.rs         | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)
 rename src/test/{run-pass => run-pass-fulldeps}/issue-15149.rs (99%)

diff --git a/src/test/debuginfo/function-prologue-stepping-regular.rs b/src/test/debuginfo/function-prologue-stepping-regular.rs
index e1a77b34e7f..b34f1af01f5 100644
--- a/src/test/debuginfo/function-prologue-stepping-regular.rs
+++ b/src/test/debuginfo/function-prologue-stepping-regular.rs
@@ -126,7 +126,6 @@
 // lldb-command:continue
 
 #![allow(unused_variables)]
-#![feature(old_io)]
 #![omit_gdb_pretty_printer_section]
 
 fn immediate_args(a: isize, b: bool, c: f64) {
@@ -157,7 +156,7 @@ fn assignment(mut a: u64, b: u64, c: f64) {
 }
 
 fn function_call(x: u64, y: u64, z: f64) {
-    std::old_io::stdio::print("Hi!")
+    println!("Hi!")
 }
 
 fn identifier(x: u64, y: u64, z: f64) -> u64 {
diff --git a/src/test/run-pass/issue-15149.rs b/src/test/run-pass-fulldeps/issue-15149.rs
similarity index 99%
rename from src/test/run-pass/issue-15149.rs
rename to src/test/run-pass-fulldeps/issue-15149.rs
index 500235b74f6..7e64bbdf703 100644
--- a/src/test/run-pass/issue-15149.rs
+++ b/src/test/run-pass-fulldeps/issue-15149.rs
@@ -9,6 +9,7 @@
 // except according to those terms.
 
 // no-prefer-dynamic
+// ignore-android
 
 #![feature(rustc_private)]
 
diff --git a/src/test/run-pass/drop-flag-skip-sanity-check.rs b/src/test/run-pass/drop-flag-skip-sanity-check.rs
index aaf5eb6f2a1..4a6c8ce70dc 100644
--- a/src/test/run-pass/drop-flag-skip-sanity-check.rs
+++ b/src/test/run-pass/drop-flag-skip-sanity-check.rs
@@ -63,5 +63,4 @@ fn test() {
         // drop-glue should detect the corruption of (at least one of)
         // the drop-flags.
     }
-    println!("We should never get here.");
 }