From dd13fd3a34da45db7c3a0c71d439541ee68d8ed8 Mon Sep 17 00:00:00 2001
From: David Tolnay <dtolnay@gmail.com>
Date: Fri, 27 Jan 2017 14:53:21 -0800
Subject: [PATCH] Isolate the compiletest dependencies

---
 .travis.yml                                           | 2 +-
 test_suite/deps/Cargo.toml                            | 9 +++++++++
 test_suite/deps/src/lib.rs                            | 0
 test_suite/tests/{compile_tests.rs => compiletest.rs} | 2 +-
 test_suite/tests/test.rs                              | 2 +-
 5 files changed, 12 insertions(+), 3 deletions(-)
 create mode 100644 test_suite/deps/Cargo.toml
 create mode 100644 test_suite/deps/src/lib.rs
 rename test_suite/tests/{compile_tests.rs => compiletest.rs} (84%)

diff --git a/.travis.yml b/.travis.yml
index b79b9a16..aca19dc8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,7 +20,7 @@ script:
   - (cd serde && travis-cargo --only nightly build -- --no-default-features --features alloc)
   - (cd serde && travis-cargo --only nightly build -- --no-default-features --features collections)
   - (cd test_suite && travis-cargo --only beta test)
-  - (cd test_suite && travis-cargo --only nightly test -- --features unstable-testing)
+  - (cd test_suite/deps && travis-cargo --only nightly build && cd .. && travis-cargo --only nightly test -- --features unstable-testing)
   - (cd test_suite/no_std && travis-cargo --only nightly build)
 
 env:
diff --git a/test_suite/deps/Cargo.toml b/test_suite/deps/Cargo.toml
new file mode 100644
index 00000000..40bd1bb5
--- /dev/null
+++ b/test_suite/deps/Cargo.toml
@@ -0,0 +1,9 @@
+[package]
+name = "serde_test_suite_deps"
+version = "0.0.0"
+authors = ["David Tolnay <dtolnay@gmail.com>"]
+publish = false
+
+[dependencies]
+serde = { path = "../../serde" }
+serde_derive = { path = "../../serde_derive" }
diff --git a/test_suite/deps/src/lib.rs b/test_suite/deps/src/lib.rs
new file mode 100644
index 00000000..e69de29b
diff --git a/test_suite/tests/compile_tests.rs b/test_suite/tests/compiletest.rs
similarity index 84%
rename from test_suite/tests/compile_tests.rs
rename to test_suite/tests/compiletest.rs
index daede763..a2b669dd 100644
--- a/test_suite/tests/compile_tests.rs
+++ b/test_suite/tests/compiletest.rs
@@ -6,7 +6,7 @@ fn run_mode(mode: &'static str) {
     let mut config = compiletest::default_config();
 
     config.mode = mode.parse().expect("invalid mode");
-    config.target_rustcflags = Some("-L target/debug/ -L target/debug/deps/".to_owned());
+    config.target_rustcflags = Some("-L deps/target/debug/deps".to_owned());
     if let Ok(name) = env::var("TESTNAME") {
         config.filter = Some(name);
     }
diff --git a/test_suite/tests/test.rs b/test_suite/tests/test.rs
index 357d6a0a..7c1b06b5 100644
--- a/test_suite/tests/test.rs
+++ b/test_suite/tests/test.rs
@@ -23,4 +23,4 @@ mod test_macros;
 mod test_ser;
 
 #[cfg(feature = "unstable-testing")]
-mod compile_tests;
+mod compiletest;