From 75e6da02d3f854f6a0cdc85e52d5ecdb0f0eecf2 Mon Sep 17 00:00:00 2001
From: David Tolnay <dtolnay@gmail.com>
Date: Fri, 24 Feb 2017 15:32:13 -0800
Subject: [PATCH] Split up test suite so it compiles in parallel

---
 test_suite/Cargo.toml                |  9 +--------
 test_suite/tests/compiletest.rs      |  2 ++
 test_suite/tests/test.rs             | 23 -----------------------
 test_suite/tests/test_annotations.rs |  3 +++
 test_suite/tests/test_bytes.rs       |  3 +++
 test_suite/tests/test_de.rs          |  7 +++++++
 test_suite/tests/test_gen.rs         |  5 +++++
 test_suite/tests/test_macros.rs      |  3 +++
 test_suite/tests/test_ser.rs         |  8 ++++++++
 9 files changed, 32 insertions(+), 31 deletions(-)
 delete mode 100644 test_suite/tests/test.rs

diff --git a/test_suite/Cargo.toml b/test_suite/Cargo.toml
index 22b37838..1cd4ff75 100644
--- a/test_suite/Cargo.toml
+++ b/test_suite/Cargo.toml
@@ -5,10 +5,7 @@ authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>"]
 publish = false
 
 [features]
-unstable-testing = [
-    "compiletest_rs",
-    "serde/unstable-testing",
-]
+unstable-testing = ["compiletest_rs"]
 
 [dev-dependencies]
 fnv = "1.0"
@@ -19,7 +16,3 @@ serde_test = { path = "../serde_test" }
 
 [dependencies]
 compiletest_rs = { version = "0.2", optional = true }
-
-[[test]]
-name = "test"
-path = "tests/test.rs"
diff --git a/test_suite/tests/compiletest.rs b/test_suite/tests/compiletest.rs
index a2b669dd..4315a858 100644
--- a/test_suite/tests/compiletest.rs
+++ b/test_suite/tests/compiletest.rs
@@ -1,3 +1,5 @@
+#![cfg(feature = "unstable-testing")]
+
 extern crate compiletest_rs as compiletest;
 
 use std::env;
diff --git a/test_suite/tests/test.rs b/test_suite/tests/test.rs
deleted file mode 100644
index b83be636..00000000
--- a/test_suite/tests/test.rs
+++ /dev/null
@@ -1,23 +0,0 @@
-#![cfg_attr(feature = "unstable-testing", feature(test, non_ascii_idents))]
-
-#[cfg(feature = "unstable-testing")]
-extern crate test;
-
-#[macro_use]
-extern crate serde_derive;
-
-extern crate serde;
-extern crate serde_test;
-
-#[macro_use]
-mod macros;
-
-mod test_annotations;
-mod test_bytes;
-mod test_de;
-mod test_gen;
-mod test_macros;
-mod test_ser;
-
-#[cfg(feature = "unstable-testing")]
-mod compiletest;
diff --git a/test_suite/tests/test_annotations.rs b/test_suite/tests/test_annotations.rs
index 7df8bb1c..b839c1af 100644
--- a/test_suite/tests/test_annotations.rs
+++ b/test_suite/tests/test_annotations.rs
@@ -1,3 +1,6 @@
+#[macro_use]
+extern crate serde_derive;
+
 extern crate serde;
 use self::serde::{Serialize, Serializer, Deserialize, Deserializer};
 
diff --git a/test_suite/tests/test_bytes.rs b/test_suite/tests/test_bytes.rs
index 86067627..28e47d1b 100644
--- a/test_suite/tests/test_bytes.rs
+++ b/test_suite/tests/test_bytes.rs
@@ -1,4 +1,7 @@
+extern crate serde;
 use serde::bytes::{ByteBuf, Bytes};
+
+extern crate serde_test;
 use serde_test::{assert_tokens, assert_ser_tokens, assert_de_tokens, Token};
 
 #[test]
diff --git a/test_suite/tests/test_de.rs b/test_suite/tests/test_de.rs
index b531a051..f4112428 100644
--- a/test_suite/tests/test_de.rs
+++ b/test_suite/tests/test_de.rs
@@ -1,9 +1,13 @@
+#[macro_use]
+extern crate serde_derive;
+
 use std::collections::{BTreeMap, BTreeSet, HashMap, HashSet};
 use std::net;
 use std::path::PathBuf;
 use std::time::Duration;
 use std::default::Default;
 
+extern crate serde;
 use serde::Deserialize;
 
 extern crate fnv;
@@ -17,6 +21,9 @@ use self::serde_test::{
     assert_de_tokens_error,
 };
 
+#[macro_use]
+mod macros;
+
 //////////////////////////////////////////////////////////////////////////
 
 #[derive(Copy, Clone, PartialEq, Debug, Deserialize)]
diff --git a/test_suite/tests/test_gen.rs b/test_suite/tests/test_gen.rs
index d008c0f2..ab449e4e 100644
--- a/test_suite/tests/test_gen.rs
+++ b/test_suite/tests/test_gen.rs
@@ -2,6 +2,11 @@
 // successfully when there are a variety of generics and non-(de)serializable
 // types involved.
 
+#![cfg_attr(feature = "unstable-testing", feature(non_ascii_idents))]
+
+#[macro_use]
+extern crate serde_derive;
+
 extern crate serde;
 use self::serde::ser::{Serialize, Serializer};
 use self::serde::de::{Deserialize, Deserializer};
diff --git a/test_suite/tests/test_macros.rs b/test_suite/tests/test_macros.rs
index 0ad36469..3e896799 100644
--- a/test_suite/tests/test_macros.rs
+++ b/test_suite/tests/test_macros.rs
@@ -1,3 +1,6 @@
+#[macro_use]
+extern crate serde_derive;
+
 extern crate serde_test;
 use self::serde_test::{
     Error,
diff --git a/test_suite/tests/test_ser.rs b/test_suite/tests/test_ser.rs
index e5c2af3d..e1f298ea 100644
--- a/test_suite/tests/test_ser.rs
+++ b/test_suite/tests/test_ser.rs
@@ -1,9 +1,14 @@
+#[macro_use]
+extern crate serde_derive;
+
 use std::collections::{BTreeMap, HashMap, HashSet};
 use std::net;
 use std::path::{Path, PathBuf};
 use std::str;
 use std::time::Duration;
 
+extern crate serde;
+
 extern crate serde_test;
 use self::serde_test::{
     Error,
@@ -18,6 +23,9 @@ use self::fnv::FnvHasher;
 #[cfg(feature = "unstable")]
 use serde::ser::iterator;
 
+#[macro_use]
+mod macros;
+
 //////////////////////////////////////////////////////////////////////////
 
 #[derive(Serialize)]