Combine the test suites

.travis.yml

@@ -17,8 +17,7 @@ script:
 - (cd serde && travis-cargo --only nightly build -- --no-default-features --features collections)
 - (cd testing && travis-cargo --skip nightly test)
 - (cd testing && travis-cargo --only nightly test -- --features unstable-testing)
-- (cd serde_derive && travis-cargo --only nightly test)
+- (cd testing/no-std-tests && travis-cargo --only nightly build)
-- (cd serde_derive/no-std-tests && travis-cargo --only nightly build)
 - (cd serde && travis-cargo --only stable doc)
 env:
   global:

serde_derive/Cargo.toml

@@ -26,9 +26,3 @@ clippy = { version = "0.*", optional = true }
 quote = "0.3.8"
 serde_codegen_internals = { version = "=0.11.3", default-features = false, path = "../serde_codegen_internals" }
 syn = { version = "0.10", features = ["aster", "visit"] }
-
-[dev-dependencies]
-compiletest_rs = "0.2"
-fnv = "1.0"
-serde = { version = "0.9", path = "../serde" }
-serde_test = { version = "0.9", path = "../serde_test" }

serde_derive/tests/test.rs

@@ -1,10 +0,0 @@
-#![feature(test)]
-
-#[macro_use]
-extern crate serde_derive;
-
-extern crate test;
-
-include!("../../testing/tests/test.rs.in");
-
-mod compile_tests;

testing/Cargo.toml

@@ -15,6 +15,7 @@ publish = false
 unstable-testing = ["clippy", "serde/unstable-testing", "serde_derive/unstable-testing"]
 
 [dev-dependencies]
+compiletest_rs = "0.2"
 fnv = "1.0"
 rustc-serialize = "0.3.16"
 serde = { path = "../serde" }

testing/no-std-tests/Cargo.toml

@@ -5,4 +5,4 @@ publish = false
 
 [dependencies]
 serde = { path = "../../serde", default-features = false }
-serde_derive = { path = ".." }
+serde_derive = { path = "../../serde_derive" }

testing/tests/test.rs

@@ -1,7 +1,10 @@
 #![cfg_attr(feature = "clippy", feature(plugin))]
 #![cfg_attr(feature = "clippy", plugin(clippy))]
 
-#![cfg_attr(feature = "unstable-testing", feature(non_ascii_idents))]
+#![cfg_attr(feature = "unstable-testing", feature(test, non_ascii_idents))]
+
+#[cfg(feature = "unstable-testing")]
+extern crate test;
 
 #[macro_use]
 extern crate serde_derive;
@@ -18,3 +21,6 @@ mod test_de;
 mod test_gen;
 mod test_macros;
 mod test_ser;
+
+#[cfg(feature = "unstable-testing")]
+mod compile_tests;