about summary refs log tree commit diff
path: root/src/test
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2015-03-23 17:29:51 -0700
committerAlex Crichton <alex@alexcrichton.com>2015-03-23 22:52:21 -0700
commitc5c3de0cf4efba1517009ee6ef2da66f03b490b9 (patch)
tree2df766b7a0b3f338b8dbb15fe13da6c7da250a17 /src/test
parent253992eb38569f7f80cc59537013b3d9d58aede6 (diff)
downloadrust-c5c3de0cf4efba1517009ee6ef2da66f03b490b9.tar.gz
rust-c5c3de0cf4efba1517009ee6ef2da66f03b490b9.zip
Test fixes and rebase conflicts, round 3
Diffstat (limited to 'src/test')
-rw-r--r--src/test/debuginfo/function-prologue-stepping-regular.rs1
-rw-r--r--src/test/run-pass/out-of-stack-no-split.rs2
2 files changed, 2 insertions, 1 deletions
diff --git a/src/test/debuginfo/function-prologue-stepping-regular.rs b/src/test/debuginfo/function-prologue-stepping-regular.rs
index 14433fbcd23..8312d16bcac 100644
--- a/src/test/debuginfo/function-prologue-stepping-regular.rs
+++ b/src/test/debuginfo/function-prologue-stepping-regular.rs
@@ -126,6 +126,7 @@
 // lldb-command:continue
 
 #![allow(unused_variables)]
+#![feature(old_io)]
 #![omit_gdb_pretty_printer_section]
 
 fn immediate_args(a: int, b: bool, c: f64) {
diff --git a/src/test/run-pass/out-of-stack-no-split.rs b/src/test/run-pass/out-of-stack-no-split.rs
index e4c7f4ef095..8887e1937c6 100644
--- a/src/test/run-pass/out-of-stack-no-split.rs
+++ b/src/test/run-pass/out-of-stack-no-split.rs
@@ -15,7 +15,7 @@
 //ignore-dragonfly
 //ignore-bitrig
 
-#![feature(asm)]
+#![feature(asm, old_io)]
 
 use std::old_io::process::Command;
 use std::env;