From 1a69b3861dd3657a919e0e3774391e052f410148 Mon Sep 17 00:00:00 2001 From: debris Date: Sun, 31 Jan 2016 20:14:27 +0100 Subject: [PATCH] make json tests optional --- .travis.yml | 2 +- ethcore/Cargo.toml | 2 ++ ethcore/src/tests/test_common.rs | 3 +++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index e20372ed7..ebb88ee7d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,7 +34,7 @@ after_success: | tar xzf master.tar.gz && mkdir kcov-master/build && cd kcov-master/build && cmake .. && make && make install DESTDIR=../tmp && cd ../.. && cargo test --no-run -p ethcore-util && cargo test --no-run -p ethash && - cargo test --no-run -p ethcore && + cargo test --no-run -p ethcore --no-default-features && cargo test --no-run && ./kcov-master/tmp/usr/local/bin/kcov --exclude-pattern /.cargo,/root/.multirust target/kcov target/debug/deps/ethcore_util-* && ./kcov-master/tmp/usr/local/bin/kcov --exclude-pattern /.cargo,/root/.multirust target/kcov target/debug/deps/ethash-* && diff --git a/ethcore/Cargo.toml b/ethcore/Cargo.toml index ef8111272..c4eff8d05 100644 --- a/ethcore/Cargo.toml +++ b/ethcore/Cargo.toml @@ -25,6 +25,8 @@ crossbeam = "0.1.5" lazy_static = "0.1" [features] +default = ["json-tests"] jit = ["evmjit"] evm_debug = [] +json-tests = [] test-heavy = [] diff --git a/ethcore/src/tests/test_common.rs b/ethcore/src/tests/test_common.rs index 87e7b979e..fd88ae96a 100644 --- a/ethcore/src/tests/test_common.rs +++ b/ethcore/src/tests/test_common.rs @@ -12,6 +12,7 @@ macro_rules! declare_test { #[ignore] #[test] #[allow(non_snake_case)] + #[cfg(feature="json-tests")] fn $id() { test!($name); } @@ -20,6 +21,7 @@ macro_rules! declare_test { #[cfg(feature = "test-heavy")] #[test] #[allow(non_snake_case)] + #[cfg(feature="json-tests")] fn $id() { test!($name); } @@ -27,6 +29,7 @@ macro_rules! declare_test { ($id: ident, $name: expr) => { #[test] #[allow(non_snake_case)] + #[cfg(feature="json-tests")] fn $id() { test!($name); }