Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use workspace.default-members to specify default crates for cargo build #19476

Merged
merged 5 commits into from Dec 7, 2017

Include test crates as workspace members rather that dev-dependencies

  • Loading branch information
SimonSapin committed Dec 7, 2017
commit 9d898cd460712adbacddcfe45f11173605d6cf7b

Some generated files are not rendered by default. Learn more.

@@ -1,8 +1,12 @@
[workspace]
members = [
"ports/cef",
"ports/geckolib",
"ports/servo",
"tests/unit/*",

"ports/geckolib",
"ports/geckolib/tests",

"ports/cef",
]
exclude = [".cargo"]

@@ -31,6 +31,3 @@ servo_arc = {path = "../../components/servo_arc"}
smallvec = "0.6"
style = {path = "../../components/style", features = ["gecko"]}
style_traits = {path = "../../components/style_traits"}

[dev-dependencies]
stylo_tests = {path = "./tests"}
@@ -13,22 +13,6 @@ path = "main.rs"
test = false
bench = false

[dev-dependencies]
deny_public_fields_tests = {path = "../../tests/unit/deny_public_fields"}
gfx_tests = {path = "../../tests/unit/gfx"}
layout_tests = {path = "../../tests/unit/layout"}
malloc_size_of_tests = {path = "../../tests/unit/malloc_size_of"}
metrics_tests = {path = "../../tests/unit/metrics"}
msg_tests = {path = "../../tests/unit/msg"}
net_tests = {path = "../../tests/unit/net"}
net_traits_tests = {path = "../../tests/unit/net_traits"}
profile_tests = {path = "../../tests/unit/profile"}
script_tests = {path = "../../tests/unit/script"}
script_plugins_tests = {path = "../../tests/unit/script_plugins"}
servo_config_tests = {path = "../../tests/unit/servo_config"}
servo_remutex_tests = {path = "../../tests/unit/servo_remutex"}
style_tests = {path = "../../tests/unit/style"}

[features]
default = ["unstable", "default-except-unstable"]
default-except-unstable = ["webdriver", "max_log_level"]
@@ -38,7 +22,7 @@ energy-profiling = ["libservo/energy-profiling"]
debugmozjs = ["libservo/debugmozjs"]
googlevr = ["libservo/googlevr"]
oculusvr = ["libservo/oculusvr"]
unstable = ["libservo/unstable", "profile_tests/unstable"]
unstable = ["libservo/unstable"]

[dependencies]
backtrace = "0.3"
@@ -9,9 +9,6 @@ name = "profile_tests"
path = "lib.rs"
doctest = false

[features]
unstable = ["servo_allocator/unstable"]

[dependencies]
ipc-channel = "0.9"
profile = {path = "../../../components/profile"}
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.