Fix up the splitting of the unit tests crate.

Closes #5707. (Includes a rebase of it.)
Fixes #5688.

tests/unit/script/Cargo.toml

@@ -9,24 +9,4 @@ path = "lib.rs"
 doctest = false
 
 [dependencies.script]
-path = "../../components/script"
-
-[dependencies.geom]
-git = "https://github.com/servo/rust-geom"
-
-[dependencies.cssparser]
-git = "https://github.com/servo/rust-cssparser"
-
-[dependencies.selectors]
-git = "https://github.com/servo/rust-selectors"
-
-[dependencies.string_cache]
-git = "https://github.com/servo/string-cache"
-
-[dependencies.string_cache_plugin]
-git = "https://github.com/servo/string-cache"
-
-[dependencies]
-cookie = "*"
-url = "*"
-hyper = "0.3"
+path = "../../../components/script"

tests/unit/script/lib.rs

@@ -2,5 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#[cfg(target_pointer_width = "64")] mod size_of;
-mod textinput;
+extern crate script;
+
+#[cfg(all(test, target_pointer_width = "64"))] mod size_of;
+#[cfg(test)] mod textinput;