about summary refs log tree commit diff
path: root/src/test
diff options
context:
space:
mode:
authorNick Cameron <ncameron@mozilla.com>2016-09-27 11:45:50 +1300
committerNick Cameron <ncameron@mozilla.com>2016-09-28 16:20:30 +1300
commite8a4db25acde9d2d23a4ebfb464d283d495b5b8d (patch)
tree5f299d1e451fbdf7377ad9e10eae6cee5e071e51 /src/test
parent322b5530ba8a74e0363243da5cdc3d0ac43762d7 (diff)
downloadrust-e8a4db25acde9d2d23a4ebfb464d283d495b5b8d.tar.gz
rust-e8a4db25acde9d2d23a4ebfb464d283d495b5b8d.zip
Allow supplying an error destination via the compiler driver
Allows replacing stderr with a buffer from the client.

Also, some refactoring around run_compiler.
Diffstat (limited to 'src/test')
-rw-r--r--src/test/run-make/llvm-phase/test.rs4
-rw-r--r--src/test/run-pass-fulldeps/compiler-calls.rs2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/test/run-make/llvm-phase/test.rs b/src/test/run-make/llvm-phase/test.rs
index 19e410fef53..05c1713561a 100644
--- a/src/test/run-make/llvm-phase/test.rs
+++ b/src/test/run-make/llvm-phase/test.rs
@@ -79,8 +79,8 @@ fn main() {
         format!("_ _ --sysroot {} --crate-type dylib", path.to_str().unwrap())
         .split(' ').map(|s| s.to_string()).collect();
 
-    let (result, _) = rustc_driver::run_compiler_with_file_loader(
-        &args, &mut JitCalls, box JitLoader);
+    let (result, _) = rustc_driver::run_compiler(
+        &args, &mut JitCalls, Some(box JitLoader), None);
     if let Err(n) = result {
         panic!("Error {}", n);
     }
diff --git a/src/test/run-pass-fulldeps/compiler-calls.rs b/src/test/run-pass-fulldeps/compiler-calls.rs
index 775ba38004e..35e9f3f5c8d 100644
--- a/src/test/run-pass-fulldeps/compiler-calls.rs
+++ b/src/test/run-pass-fulldeps/compiler-calls.rs
@@ -86,6 +86,6 @@ fn main() {
     let mut tc = TestCalls { count: 1 };
     // we should never get use this filename, but lets make sure they are valid args.
     let args = vec!["compiler-calls".to_string(), "foo.rs".to_string()];
-    rustc_driver::run_compiler(&args, &mut tc);
+    rustc_driver::run_compiler(&args, &mut tc, None, None);
     assert_eq!(tc.count, 30);
 }