diff --git a/.travis.yml b/.travis.yml index 7b148d6d..bff448e8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,8 +17,7 @@ script: - (cd serde && travis-cargo --only nightly build -- --no-default-features --features collections) - (cd testing && travis-cargo --skip nightly test) - (cd testing && travis-cargo --only nightly test -- --features unstable-testing) -- (cd serde_derive && travis-cargo --only nightly test) -- (cd serde_derive/no-std-tests && travis-cargo --only nightly build) +- (cd testing/no-std-tests && travis-cargo --only nightly build) - (cd serde && travis-cargo --only stable doc) env: global: diff --git a/serde_derive/Cargo.toml b/serde_derive/Cargo.toml index 9ec6a605..16a593e2 100644 --- a/serde_derive/Cargo.toml +++ b/serde_derive/Cargo.toml @@ -26,9 +26,3 @@ clippy = { version = "0.*", optional = true } quote = "0.3.8" serde_codegen_internals = { version = "=0.11.3", default-features = false, path = "../serde_codegen_internals" } syn = { version = "0.10", features = ["aster", "visit"] } - -[dev-dependencies] -compiletest_rs = "0.2" -fnv = "1.0" -serde = { version = "0.9", path = "../serde" } -serde_test = { version = "0.9", path = "../serde_test" } diff --git a/serde_derive/tests/test.rs b/serde_derive/tests/test.rs deleted file mode 100644 index b1969a8f..00000000 --- a/serde_derive/tests/test.rs +++ /dev/null @@ -1,10 +0,0 @@ -#![feature(test)] - -#[macro_use] -extern crate serde_derive; - -extern crate test; - -include!("../../testing/tests/test.rs.in"); - -mod compile_tests; diff --git a/testing/Cargo.toml b/testing/Cargo.toml index 9ad1333f..44ddd0ee 100644 --- a/testing/Cargo.toml +++ b/testing/Cargo.toml @@ -15,6 +15,7 @@ publish = false unstable-testing = ["clippy", "serde/unstable-testing", "serde_derive/unstable-testing"] [dev-dependencies] +compiletest_rs = "0.2" fnv = "1.0" rustc-serialize = "0.3.16" serde = { path = "../serde" } diff --git a/serde_derive/no-std-tests/Cargo.toml b/testing/no-std-tests/Cargo.toml similarity index 76% rename from serde_derive/no-std-tests/Cargo.toml rename to testing/no-std-tests/Cargo.toml index aa875b59..caef3d1c 100644 --- a/serde_derive/no-std-tests/Cargo.toml +++ b/testing/no-std-tests/Cargo.toml @@ -5,4 +5,4 @@ publish = false [dependencies] serde = { path = "../../serde", default-features = false } -serde_derive = { path = ".." } +serde_derive = { path = "../../serde_derive" } diff --git a/serde_derive/no-std-tests/src/main.rs b/testing/no-std-tests/src/main.rs similarity index 100% rename from serde_derive/no-std-tests/src/main.rs rename to testing/no-std-tests/src/main.rs diff --git a/serde_derive/tests/compile-fail/duplicate-attribute/rename-and-ser.rs b/testing/tests/compile-fail/duplicate-attribute/rename-and-ser.rs similarity index 100% rename from serde_derive/tests/compile-fail/duplicate-attribute/rename-and-ser.rs rename to testing/tests/compile-fail/duplicate-attribute/rename-and-ser.rs diff --git a/serde_derive/tests/compile-fail/duplicate-attribute/rename-rename-de.rs b/testing/tests/compile-fail/duplicate-attribute/rename-rename-de.rs similarity index 100% rename from serde_derive/tests/compile-fail/duplicate-attribute/rename-rename-de.rs rename to testing/tests/compile-fail/duplicate-attribute/rename-rename-de.rs diff --git a/serde_derive/tests/compile-fail/duplicate-attribute/rename-ser-rename-ser.rs b/testing/tests/compile-fail/duplicate-attribute/rename-ser-rename-ser.rs similarity index 100% rename from serde_derive/tests/compile-fail/duplicate-attribute/rename-ser-rename-ser.rs rename to testing/tests/compile-fail/duplicate-attribute/rename-ser-rename-ser.rs diff --git a/serde_derive/tests/compile-fail/duplicate-attribute/rename-ser-rename.rs b/testing/tests/compile-fail/duplicate-attribute/rename-ser-rename.rs similarity index 100% rename from serde_derive/tests/compile-fail/duplicate-attribute/rename-ser-rename.rs rename to testing/tests/compile-fail/duplicate-attribute/rename-ser-rename.rs diff --git a/serde_derive/tests/compile-fail/duplicate-attribute/rename-ser-ser.rs b/testing/tests/compile-fail/duplicate-attribute/rename-ser-ser.rs similarity index 100% rename from serde_derive/tests/compile-fail/duplicate-attribute/rename-ser-ser.rs rename to testing/tests/compile-fail/duplicate-attribute/rename-ser-ser.rs diff --git a/serde_derive/tests/compile-fail/duplicate-attribute/two-rename-ser.rs b/testing/tests/compile-fail/duplicate-attribute/two-rename-ser.rs similarity index 100% rename from serde_derive/tests/compile-fail/duplicate-attribute/two-rename-ser.rs rename to testing/tests/compile-fail/duplicate-attribute/two-rename-ser.rs diff --git a/serde_derive/tests/compile-fail/str_ref_deser.rs b/testing/tests/compile-fail/str_ref_deser.rs similarity index 100% rename from serde_derive/tests/compile-fail/str_ref_deser.rs rename to testing/tests/compile-fail/str_ref_deser.rs diff --git a/serde_derive/tests/compile-fail/unknown-attribute/container.rs b/testing/tests/compile-fail/unknown-attribute/container.rs similarity index 100% rename from serde_derive/tests/compile-fail/unknown-attribute/container.rs rename to testing/tests/compile-fail/unknown-attribute/container.rs diff --git a/serde_derive/tests/compile-fail/unknown-attribute/field.rs b/testing/tests/compile-fail/unknown-attribute/field.rs similarity index 100% rename from serde_derive/tests/compile-fail/unknown-attribute/field.rs rename to testing/tests/compile-fail/unknown-attribute/field.rs diff --git a/serde_derive/tests/compile-fail/unknown-attribute/variant.rs b/testing/tests/compile-fail/unknown-attribute/variant.rs similarity index 100% rename from serde_derive/tests/compile-fail/unknown-attribute/variant.rs rename to testing/tests/compile-fail/unknown-attribute/variant.rs diff --git a/serde_derive/tests/compile_tests.rs b/testing/tests/compile_tests.rs similarity index 100% rename from serde_derive/tests/compile_tests.rs rename to testing/tests/compile_tests.rs diff --git a/serde_derive/tests/run-pass/identity-op.rs b/testing/tests/run-pass/identity-op.rs similarity index 100% rename from serde_derive/tests/run-pass/identity-op.rs rename to testing/tests/run-pass/identity-op.rs diff --git a/testing/tests/test.rs b/testing/tests/test.rs index f7483c2f..357d6a0a 100644 --- a/testing/tests/test.rs +++ b/testing/tests/test.rs @@ -1,7 +1,10 @@ #![cfg_attr(feature = "clippy", feature(plugin))] #![cfg_attr(feature = "clippy", plugin(clippy))] -#![cfg_attr(feature = "unstable-testing", feature(non_ascii_idents))] +#![cfg_attr(feature = "unstable-testing", feature(test, non_ascii_idents))] + +#[cfg(feature = "unstable-testing")] +extern crate test; #[macro_use] extern crate serde_derive; @@ -18,3 +21,6 @@ mod test_de; mod test_gen; mod test_macros; mod test_ser; + +#[cfg(feature = "unstable-testing")] +mod compile_tests;