Merge servo_remutex to servo_remutex_tests

This commit is contained in:
Anthony Ramine 2018-01-19 16:49:02 +01:00
parent 14d0cf595f
commit 2ec3ed97db
5 changed files with 3 additions and 23 deletions

7
Cargo.lock generated
View file

@ -2920,13 +2920,6 @@ dependencies = [
"nonzero 0.0.1", "nonzero 0.0.1",
] ]
[[package]]
name = "servo_remutex_tests"
version = "0.0.1"
dependencies = [
"servo_remutex 0.0.1",
]
[[package]] [[package]]
name = "servo_url" name = "servo_url"
version = "0.0.1" version = "0.0.1"

View file

@ -8,6 +8,8 @@ publish = false
[lib] [lib]
name = "servo_remutex" name = "servo_remutex"
path = "lib.rs" path = "lib.rs"
test = false
doctest = false
[dependencies] [dependencies]
lazy_static = "1" lazy_static = "1"

View file

@ -10,8 +10,6 @@
// These tests came from https://github.com/rust-lang/rust/blob/master/src/libstd/sys/common/remutex.rs // These tests came from https://github.com/rust-lang/rust/blob/master/src/libstd/sys/common/remutex.rs
#![cfg(test)]
extern crate servo_remutex; extern crate servo_remutex;
use servo_remutex::{ReentrantMutex, ReentrantMutexGuard}; use servo_remutex::{ReentrantMutex, ReentrantMutexGuard};

View file

@ -239,6 +239,7 @@ class MachCommands(CommandBase):
"net_traits", "net_traits",
"selectors", "selectors",
"servo_config", "servo_config",
"servo_remutex",
] ]
if not packages: if not packages:
packages = set(os.listdir(path.join(self.context.topdir, "tests", "unit"))) - set(['.DS_Store']) packages = set(os.listdir(path.join(self.context.topdir, "tests", "unit"))) - set(['.DS_Store'])

View file

@ -1,14 +0,0 @@
[package]
name = "servo_remutex_tests"
version = "0.0.1"
authors = ["The Servo Project Developers"]
license = "MPL-2.0"
[lib]
name = "servo_remutex_tests"
path = "lib.rs"
doctest = false
[dependencies]
servo_remutex = {path = "../../../components/remutex"}