diff --git a/.travis.yml b/.travis.yml index ff56c482..de282ca2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,15 +22,15 @@ script: - (cd serde && travis-cargo build -- --no-default-features) - (cd serde && travis-cargo --only nightly build -- --no-default-features --features alloc) - (cd serde && travis-cargo --only nightly build -- --no-default-features --features collections) -- (cd serde_tests && travis-cargo --skip nightly test) -- (cd serde_tests && travis-cargo --only nightly test -- --features nightly-testing) +- (cd testing && travis-cargo --skip nightly test) +- (cd testing && travis-cargo --only nightly test -- --features nightly-testing) - (cd serde_macros && travis-cargo --only nightly test -- --features nightly-testing) - (cd examples/serde-syntex-example && travis-cargo --skip nightly run) - (cd examples/serde-syntex-example && travis-cargo --only nightly run -- --no-default-features --features nightly) - (cd serde && travis-cargo --only stable doc) after_success: - (cd serde && travis-cargo --only stable doc-upload) -- (cd serde_tests && travis-cargo --only stable coveralls --no-sudo) +- (cd testing && travis-cargo --only stable coveralls --no-sudo) env: global: - TRAVIS_CARGO_NIGHTLY_FEATURE="" diff --git a/serde_macros/benches/bench.rs b/serde_macros/benches/bench.rs index 089bc852..ec15c18c 100644 --- a/serde_macros/benches/bench.rs +++ b/serde_macros/benches/bench.rs @@ -6,4 +6,4 @@ extern crate rustc_serialize; extern crate serde; extern crate test; -include!("../../serde_tests/benches/bench.rs.in"); +include!("../../testing/benches/bench.rs.in"); diff --git a/serde_macros/tests/test.rs b/serde_macros/tests/test.rs index f2e785a5..e9211218 100644 --- a/serde_macros/tests/test.rs +++ b/serde_macros/tests/test.rs @@ -4,6 +4,6 @@ extern crate serde; extern crate test; -include!("../../serde_tests/tests/test.rs.in"); +include!("../../testing/tests/test.rs.in"); mod compile_tests; diff --git a/serde_tests/Cargo.toml b/testing/Cargo.toml similarity index 97% rename from serde_tests/Cargo.toml rename to testing/Cargo.toml index 2f28417a..27dab564 100644 --- a/serde_tests/Cargo.toml +++ b/testing/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "serde_tests" +name = "serde_testing" version = "0.7.11" authors = ["Erick Tryzelaar "] license = "MIT/Apache-2.0" diff --git a/serde_tests/benches/bench.rs b/testing/benches/bench.rs similarity index 100% rename from serde_tests/benches/bench.rs rename to testing/benches/bench.rs diff --git a/serde_tests/benches/bench.rs.in b/testing/benches/bench.rs.in similarity index 100% rename from serde_tests/benches/bench.rs.in rename to testing/benches/bench.rs.in diff --git a/serde_tests/benches/bench_enum.rs b/testing/benches/bench_enum.rs similarity index 100% rename from serde_tests/benches/bench_enum.rs rename to testing/benches/bench_enum.rs diff --git a/serde_tests/benches/bench_map.rs b/testing/benches/bench_map.rs similarity index 100% rename from serde_tests/benches/bench_map.rs rename to testing/benches/bench_map.rs diff --git a/serde_tests/benches/bench_struct.rs b/testing/benches/bench_struct.rs similarity index 100% rename from serde_tests/benches/bench_struct.rs rename to testing/benches/bench_struct.rs diff --git a/serde_tests/benches/bench_vec.rs b/testing/benches/bench_vec.rs similarity index 100% rename from serde_tests/benches/bench_vec.rs rename to testing/benches/bench_vec.rs diff --git a/serde_tests/build.rs b/testing/build.rs similarity index 100% rename from serde_tests/build.rs rename to testing/build.rs diff --git a/serde_tests/tests/macros.rs b/testing/tests/macros.rs similarity index 100% rename from serde_tests/tests/macros.rs rename to testing/tests/macros.rs diff --git a/serde_tests/tests/test.rs b/testing/tests/test.rs similarity index 100% rename from serde_tests/tests/test.rs rename to testing/tests/test.rs diff --git a/serde_tests/tests/test.rs.in b/testing/tests/test.rs.in similarity index 100% rename from serde_tests/tests/test.rs.in rename to testing/tests/test.rs.in diff --git a/serde_tests/tests/test_annotations.rs b/testing/tests/test_annotations.rs similarity index 100% rename from serde_tests/tests/test_annotations.rs rename to testing/tests/test_annotations.rs diff --git a/serde_tests/tests/test_bytes.rs b/testing/tests/test_bytes.rs similarity index 100% rename from serde_tests/tests/test_bytes.rs rename to testing/tests/test_bytes.rs diff --git a/serde_tests/tests/test_de.rs b/testing/tests/test_de.rs similarity index 100% rename from serde_tests/tests/test_de.rs rename to testing/tests/test_de.rs diff --git a/serde_tests/tests/test_gen.rs b/testing/tests/test_gen.rs similarity index 100% rename from serde_tests/tests/test_gen.rs rename to testing/tests/test_gen.rs diff --git a/serde_tests/tests/test_macros.rs b/testing/tests/test_macros.rs similarity index 100% rename from serde_tests/tests/test_macros.rs rename to testing/tests/test_macros.rs diff --git a/serde_tests/tests/test_ser.rs b/testing/tests/test_ser.rs similarity index 100% rename from serde_tests/tests/test_ser.rs rename to testing/tests/test_ser.rs diff --git a/serde_tests/tests/token.rs b/testing/tests/token.rs similarity index 100% rename from serde_tests/tests/token.rs rename to testing/tests/token.rs