From 1d497828a76ae0739463ef6a196fa4b98b06173c Mon Sep 17 00:00:00 2001
From: Manish Goregaokar <manishsmail@gmail.com>
Date: Tue, 20 Sep 2016 20:38:16 +0530
Subject: [PATCH] Move sanity checks to stylo tests

---
 ports/geckolib/Cargo.lock                             |  1 +
 ports/geckolib/Cargo.toml                             |  2 +-
 ports/geckolib/lib.rs                                 |  1 -
 python/servo/testing_commands.py                      |  7 +++----
 tests/unit/stylo/Cargo.toml                           |  1 +
 tests/unit/stylo/lib.rs                               | 11 ++++++-----
 {ports/geckolib => tests/unit/stylo}/sanity_checks.rs |  2 +-
 7 files changed, 13 insertions(+), 12 deletions(-)
 rename {ports/geckolib => tests/unit/stylo}/sanity_checks.rs (96%)

diff --git a/ports/geckolib/Cargo.lock b/ports/geckolib/Cargo.lock
index 4bb97da98355..8581961e3295 100644
--- a/ports/geckolib/Cargo.lock
+++ b/ports/geckolib/Cargo.lock
@@ -401,6 +401,7 @@ version = "0.0.1"
 dependencies = [
  "app_units 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "cssparser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gecko_bindings 0.0.1",
  "style 0.0.1",
  "style_traits 0.0.1",
 ]
diff --git a/ports/geckolib/Cargo.toml b/ports/geckolib/Cargo.toml
index 604411df56ba..7a6b83d1e180 100644
--- a/ports/geckolib/Cargo.toml
+++ b/ports/geckolib/Cargo.toml
@@ -25,4 +25,4 @@ style_traits = {path = "../../components/style_traits"}
 url = "1.2"
 
 [dev-dependencies]
-stylo_tests = {path = "../../tests/unit/stylo"}
\ No newline at end of file
+stylo_tests = {path = "../../tests/unit/stylo"}
diff --git a/ports/geckolib/lib.rs b/ports/geckolib/lib.rs
index 7bfea1b9bcdb..337332c4da82 100644
--- a/ports/geckolib/lib.rs
+++ b/ports/geckolib/lib.rs
@@ -22,7 +22,6 @@ mod snapshot;
 mod snapshot_helpers;
 #[allow(non_snake_case)]
 pub mod glue;
-mod sanity_checks;
 mod traversal;
 mod wrapper;
 
diff --git a/python/servo/testing_commands.py b/python/servo/testing_commands.py
index 7e146afc0558..a3206b745f31 100644
--- a/python/servo/testing_commands.py
+++ b/python/servo/testing_commands.py
@@ -208,6 +208,8 @@ def test_unit(self, test_name=None, package=None):
         if not packages:
             packages = set(os.listdir(path.join(self.context.topdir, "tests", "unit")))
 
+        packages.remove('stylo')
+
         args = ["cargo", "test"]
         for crate in packages:
             args += ["-p", "%s_tests" % crate]
@@ -235,10 +237,7 @@ def test_unit(self, test_name=None, package=None):
     @Command('test-stylo',
              description='Run stylo unit tests',
              category='testing')
-    def test_unit(self, test_name=None, package=None):
-        if test_name is None:
-            test_name = []
-
+    def test_stylo(self):
         self.set_use_stable_rust()
         self.ensure_bootstrapped()
 
diff --git a/tests/unit/stylo/Cargo.toml b/tests/unit/stylo/Cargo.toml
index e64d2de3c2bb..7989417eb8b2 100644
--- a/tests/unit/stylo/Cargo.toml
+++ b/tests/unit/stylo/Cargo.toml
@@ -12,5 +12,6 @@ doctest = false
 [dependencies]
 app_units = "0.3"
 cssparser = {version = "0.7", features = ["heap_size"]}
+gecko_bindings = {path = "../../../ports/geckolib/gecko_bindings"}
 style = {path = "../../../components/style", features = ["gecko"]}
 style_traits = {path = "../../../components/style_traits"}
diff --git a/tests/unit/stylo/lib.rs b/tests/unit/stylo/lib.rs
index 3af0f5c54eeb..62e96c3588fe 100644
--- a/tests/unit/stylo/lib.rs
+++ b/tests/unit/stylo/lib.rs
@@ -1,10 +1,11 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * 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/. */
+
 extern crate app_units;
 extern crate cssparser;
+extern crate gecko_bindings;
 extern crate style;
 extern crate style_traits;
 
-#[test]
-fn test_test() {
-    // do nothing
-    // this is a temporary test testing that the test runs
-}
\ No newline at end of file
+mod sanity_checks;
diff --git a/ports/geckolib/sanity_checks.rs b/tests/unit/stylo/sanity_checks.rs
similarity index 96%
rename from ports/geckolib/sanity_checks.rs
rename to tests/unit/stylo/sanity_checks.rs
index 8809b6a644ad..74890856f80a 100644
--- a/ports/geckolib/sanity_checks.rs
+++ b/tests/unit/stylo/sanity_checks.rs
@@ -62,7 +62,7 @@ fn assert_basic_pseudo_elements() {
         };
     }
 
-    include!("../../components/style/generated/gecko_pseudo_element_helper.rs");
+    include!("../../../components/style/generated/gecko_pseudo_element_helper.rs");
 
     assert!(saw_before);
     assert!(saw_after);