build: Don't require full target libs to run compiletest tests

Only build through librustsyntax, which some tests do rely on.

4 files changed, 25 insertions, 28 deletions

diff --git a/src/test/compile-fail/qquote-1.rs b/src/test/compile-fail/qquote-1.rs
index d22b33846c6..49c0407d3fb 100644
--- a/src/test/compile-fail/qquote-1.rs
+++ b/src/test/compile-fail/qquote-1.rs
@@ -1,16 +1,15 @@
 // xfail-pretty
 
 use std;
-use rustc;
+use syntax(name = "rustsyntax");
 
-import rustc::*;
 import io::*;
 
-import rustc::driver::diagnostic;
-import rustc::syntax::ast;
-import rustc::syntax::codemap;
-import rustc::syntax::parse;
-import rustc::syntax::print::*;
+import syntax::diagnostic;
+import syntax::ast;
+import syntax::codemap;
+import syntax::parse;
+import syntax::print::*;
 
 fn new_parse_sess() -> parse::parse_sess {
   fail;
diff --git a/src/test/compile-fail/qquote-2.rs b/src/test/compile-fail/qquote-2.rs
index a29543e29d8..87a604d6b54 100644
--- a/src/test/compile-fail/qquote-2.rs
+++ b/src/test/compile-fail/qquote-2.rs
@@ -1,16 +1,15 @@
 // xfail-pretty
 
 use std;
-use rustc;
+use syntax(name = "rustsyntax");
 
-import rustc::*;
 import std::io::*;
 
-import rustc::driver::diagnostic;
-import rustc::syntax::ast;
-import rustc::syntax::codemap;
-import rustc::syntax::parse::parser;
-import rustc::syntax::print::*;
+import syntax::diagnostic;
+import syntax::ast;
+import syntax::codemap;
+import syntax::parse::parser;
+import syntax::print::*;
 
 fn new_parse_sess() -> parser::parse_sess {
   fail;
diff --git a/src/test/run-pass/issue-1926.rs b/src/test/run-pass/issue-1926.rs
index 0cd4e0fdfc5..95171f2c729 100644
--- a/src/test/run-pass/issue-1926.rs
+++ b/src/test/run-pass/issue-1926.rs
@@ -1,12 +1,12 @@
 // xfail-test
 // fails pretty printing for some reason
-use rustc;
-import rustc::driver::diagnostic;
-import rustc::syntax;
-import rustc::syntax::ast;
-import rustc::syntax::codemap;
-import rustc::syntax::print::pprust;
-import rustc::syntax::parse::parser;
+use syntax(name = "rustsyntax");
+import syntax::diagnostic;
+import syntax;
+import syntax::ast;
+import syntax::codemap;
+import syntax::print::pprust;
+import syntax::parse::parser;
 
 fn new_parse_sess() -> parser::parse_sess {
     let cm = codemap::new_codemap();
diff --git a/src/test/run-pass/qquote.rs b/src/test/run-pass/qquote.rs
index 7a4bf00f0ae..750102b73a2 100644
--- a/src/test/run-pass/qquote.rs
+++ b/src/test/run-pass/qquote.rs
@@ -1,16 +1,15 @@
 // xfail-pretty
 
 use std;
-use rustc;
+use syntax(name = "rustsyntax");
 
-import rustc::*;
 import io::*;
 
-import rustc::driver::diagnostic;
-import rustc::syntax::ast;
-import rustc::syntax::codemap;
-import rustc::syntax::parse;
-import rustc::syntax::print::*;
+import syntax::diagnostic;
+import syntax::ast;
+import syntax::codemap;
+import syntax::parse;
+import syntax::print::*;
 
 fn new_parse_sess() -> parse::parse_sess {
     let cm = codemap::new_codemap();