grassrootseconomics/openethereum
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

make json tests optional

Browse Source
This commit is contained in:
debris 2016-01-31 20:14:27 +01:00
parent bd7ef539b6
commit 1a69b3861d
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -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 ../.. && 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 ethcore-util &&
cargo test --no-run -p ethash && 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 && 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/ethcore_util-* &&
./kcov-master/tmp/usr/local/bin/kcov --exclude-pattern /.cargo,/root/.multirust target/kcov target/debug/deps/ethash-* && ./kcov-master/tmp/usr/local/bin/kcov --exclude-pattern /.cargo,/root/.multirust target/kcov target/debug/deps/ethash-* &&

2
ethcore/Cargo.toml
View File

@ -25,6 +25,8 @@ crossbeam = "0.1.5"
lazy_static = "0.1" lazy_static = "0.1"
[features] [features]
default = ["json-tests"]
jit = ["evmjit"] jit = ["evmjit"]
evm_debug = [] evm_debug = []
json-tests = []
test-heavy = [] test-heavy = []

3
ethcore/src/tests/test_common.rs
View File

@ -12,6 +12,7 @@ macro_rules! declare_test {
#[ignore] #[ignore]
#[test] #[test]
#[allow(non_snake_case)] #[allow(non_snake_case)]
#[cfg(feature="json-tests")]
fn $id() { fn $id() {
test!($name); test!($name);
} }
@ -20,6 +21,7 @@ macro_rules! declare_test {
#[cfg(feature = "test-heavy")] #[cfg(feature = "test-heavy")]
#[test] #[test]
#[allow(non_snake_case)] #[allow(non_snake_case)]
#[cfg(feature="json-tests")]
fn $id() { fn $id() {
test!($name); test!($name);
} }
@ -27,6 +29,7 @@ macro_rules! declare_test {
($id: ident, $name: expr) => { ($id: ident, $name: expr) => {
#[test] #[test]
#[allow(non_snake_case)] #[allow(non_snake_case)]
#[cfg(feature="json-tests")]
fn $id() { fn $id() {
test!($name); test!($name);
} }