From 05a364c7b8d5787fdd25f42a874c949ebaca1e56 Mon Sep 17 00:00:00 2001
From: Simon Sapin <simon.sapin@exyr.org>
Date: Thu, 30 Nov 2017 16:04:11 +0100
Subject: [PATCH] Move Stylo unit tests out of tests/unit

This will allow writing `tests/unit/*` in the root `Cargo.toml` file
to designate Servo unit tests.
---
 ports/geckolib/Cargo.toml                                       | 2 +-
 {tests/unit/stylo => ports/geckolib/tests}/Cargo.toml           | 0
 {tests/unit/stylo => ports/geckolib/tests}/build.rs             | 0
 {tests/unit/stylo => ports/geckolib/tests}/lib.rs               | 0
 .../stylo => ports/geckolib/tests}/servo_function_signatures.rs | 0
 {tests/unit/stylo => ports/geckolib/tests}/size_of.rs           | 0
 {tests/unit/stylo => ports/geckolib/tests}/specified_values.rs  | 0
 tests/unit/style/lib.rs                                         | 2 +-
 8 files changed, 2 insertions(+), 2 deletions(-)
 rename {tests/unit/stylo => ports/geckolib/tests}/Cargo.toml (100%)
 rename {tests/unit/stylo => ports/geckolib/tests}/build.rs (100%)
 rename {tests/unit/stylo => ports/geckolib/tests}/lib.rs (100%)
 rename {tests/unit/stylo => ports/geckolib/tests}/servo_function_signatures.rs (100%)
 rename {tests/unit/stylo => ports/geckolib/tests}/size_of.rs (100%)
 rename {tests/unit/stylo => ports/geckolib/tests}/specified_values.rs (100%)

diff --git a/ports/geckolib/Cargo.toml b/ports/geckolib/Cargo.toml
index 70ffc615d9b..5f370937b68 100644
--- a/ports/geckolib/Cargo.toml
+++ b/ports/geckolib/Cargo.toml
@@ -33,4 +33,4 @@ style = {path = "../../components/style", features = ["gecko"]}
 style_traits = {path = "../../components/style_traits"}
 
 [dev-dependencies]
-stylo_tests = {path = "../../tests/unit/stylo"}
+stylo_tests = {path = "./tests"}
diff --git a/tests/unit/stylo/Cargo.toml b/ports/geckolib/tests/Cargo.toml
similarity index 100%
rename from tests/unit/stylo/Cargo.toml
rename to ports/geckolib/tests/Cargo.toml
diff --git a/tests/unit/stylo/build.rs b/ports/geckolib/tests/build.rs
similarity index 100%
rename from tests/unit/stylo/build.rs
rename to ports/geckolib/tests/build.rs
diff --git a/tests/unit/stylo/lib.rs b/ports/geckolib/tests/lib.rs
similarity index 100%
rename from tests/unit/stylo/lib.rs
rename to ports/geckolib/tests/lib.rs
diff --git a/tests/unit/stylo/servo_function_signatures.rs b/ports/geckolib/tests/servo_function_signatures.rs
similarity index 100%
rename from tests/unit/stylo/servo_function_signatures.rs
rename to ports/geckolib/tests/servo_function_signatures.rs
diff --git a/tests/unit/stylo/size_of.rs b/ports/geckolib/tests/size_of.rs
similarity index 100%
rename from tests/unit/stylo/size_of.rs
rename to ports/geckolib/tests/size_of.rs
diff --git a/tests/unit/stylo/specified_values.rs b/ports/geckolib/tests/specified_values.rs
similarity index 100%
rename from tests/unit/stylo/specified_values.rs
rename to ports/geckolib/tests/specified_values.rs
diff --git a/tests/unit/style/lib.rs b/tests/unit/style/lib.rs
index 07d83afa261..9bcc92965e8 100644
--- a/tests/unit/style/lib.rs
+++ b/tests/unit/style/lib.rs
@@ -32,7 +32,7 @@ mod parsing;
 mod properties;
 mod rule_tree;
 mod size_of;
-#[path = "../stylo/specified_values.rs"]
+#[path = "../../../ports/geckolib/tests/specified_values.rs"]
 mod specified_values;
 mod str;
 mod stylesheets;