From baec2909b6eed175a38f60071bea88c589a668c0 Mon Sep 17 00:00:00 2001 From: debris Date: Tue, 2 Feb 2016 02:04:03 +0100 Subject: [PATCH 1/4] added dumb tests for parity and ethcore-rpc to include them in coverage reports, added TARGETS env variable to travis.yml --- .travis.yml | 20 +++++--------------- parity/main.rs | 4 ++++ rpc/src/lib.rs | 5 +++++ 3 files changed, 14 insertions(+), 15 deletions(-) diff --git a/.travis.yml b/.travis.yml index cc788887a..d64cf4a9e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,7 @@ matrix: fast_finish: true include: - rust: nightly - env: FEATURES="--features ethcore/json-tests" KCOV_FEATURES="" + env: FEATURES="--features ethcore/json-tests" KCOV_FEATURES="" TARGETS="-p ethash -p ethcore-util -p ethcore -p ethsync -p ethcore-rpc -p parity" cache: apt: true directories: @@ -28,22 +28,12 @@ before_script: | sudo apt-get install -y --force-yes librocksdb script: - cargo build --release --verbose ${FEATURES} -- cargo test --release -p ethash --verbose ${FEATURES} -- cargo test --release -p ethcore-util --verbose ${FEATURES} -- cargo test --release -p ethcore --verbose ${FEATURES} -- cargo test --release -p ethsync --verbose ${FEATURES} -- cargo test --release -p ethcore-rpc --verbose ${FEATURES} -- cargo test --release -p parity --verbose ${FEATURES} -- cargo bench --no-run ${FEATURES} +- cargo test --release --verbose ${FEATURES} ${TARGETS} +- cargo bench --no-run ${FEATURES} ${TARGETS} after_success: | wget https://github.com/SimonKagstrom/kcov/archive/master.tar.gz && 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 ${KCOV_FEATURES} && - cargo test --no-run -p ethash ${KCOV_FEATURES} && - cargo test --no-run -p ethcore ${KCOV_FEATURES} && - cargo test --no-run -p ethsync ${KCOV_FEATURES} && - cargo test --no-run -p ethcore-rpc ${KCOV_FEATURES} && - cargo test --no-run -p parity ${KCOV_FEATURES} && + cargo test --no-run ${KCOV_FEATURES} ${TARGETS} && ./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/ethcore-* && @@ -53,7 +43,7 @@ after_success: | [ $TRAVIS_BRANCH = master ] && [ $TRAVIS_PULL_REQUEST = false ] && [ $TRAVIS_RUST_VERSION = nightly ] && - cargo doc ${KCOV_FEATURES} --no-deps --verbose -p ethash -p ethcore-util -p ethcore -p ethsync -p ethcore-rpc -p parity && + cargo doc --no-deps --verbose ${KCOV_FEATURES} ${RARGETS} && echo '' > target/doc/index.html && pip install --user ghp-import && /home/travis/.local/bin/ghp-import -n target/doc diff --git a/parity/main.rs b/parity/main.rs index a9dfe004e..a120f7272 100644 --- a/parity/main.rs +++ b/parity/main.rs @@ -169,3 +169,7 @@ impl IoHandler for ClientIoHandler { } } +/// Parity needs at least 1 test to generate coverage reports correctly. +#[test] +fn if_works() { +} diff --git a/rpc/src/lib.rs b/rpc/src/lib.rs index fa24694f4..f81e65551 100644 --- a/rpc/src/lib.rs +++ b/rpc/src/lib.rs @@ -42,3 +42,8 @@ impl HttpServer { server.start_async(addr) } } + +/// Lib needs at least 1 test to generate coverage reports correctly. +#[test] +fn if_works() { +} From 26652a2ed891f7e4847ae7cf2270b50c16a53930 Mon Sep 17 00:00:00 2001 From: debris Date: Tue, 2 Feb 2016 02:31:17 +0100 Subject: [PATCH 2/4] fixed rlp benchmarks --- util/benches/rlp.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/util/benches/rlp.rs b/util/benches/rlp.rs index 8bc7599e4..e322143f7 100644 --- a/util/benches/rlp.rs +++ b/util/benches/rlp.rs @@ -63,9 +63,9 @@ fn bench_stream_nested_empty_lists(b: &mut Bencher) { b.iter(|| { // [ [], [[]], [ [], [[]] ] ] let mut stream = RlpStream::new_list(3); - stream.append_list(0); - stream.append_list(1).append_list(0); - stream.append_list(2).append_list(0).append_list(1).append_list(0); + stream.begin_list(0); + stream.begin_list(1).begin_list(0); + stream.begin_list(2).begin_list(0).begin_list(1).begin_list(0); let _ = stream.out(); }); } @@ -89,7 +89,7 @@ fn bench_stream_1000_empty_lists(b: &mut Bencher) { b.iter(|| { let mut stream = RlpStream::new_list(1000); for _ in 0..1000 { - stream.append_list(0); + stream.begin_list(0); } let _ = stream.out(); }); From 3d6f5a6ca7df79d1bdfdda30cb41c7bd075ca62b Mon Sep 17 00:00:00 2001 From: debris Date: Tue, 2 Feb 2016 02:32:58 +0100 Subject: [PATCH 3/4] fixed typo in travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index d64cf4a9e..2663d0d8e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -43,7 +43,7 @@ after_success: | [ $TRAVIS_BRANCH = master ] && [ $TRAVIS_PULL_REQUEST = false ] && [ $TRAVIS_RUST_VERSION = nightly ] && - cargo doc --no-deps --verbose ${KCOV_FEATURES} ${RARGETS} && + cargo doc --no-deps --verbose ${KCOV_FEATURES} ${TARGETS} && echo '' > target/doc/index.html && pip install --user ghp-import && /home/travis/.local/bin/ghp-import -n target/doc From 620146bddac7d1125fd298aa98b45c48cd1b8b54 Mon Sep 17 00:00:00 2001 From: debris Date: Tue, 2 Feb 2016 02:38:15 +0100 Subject: [PATCH 4/4] uncomment rlp benches --- util/benches/rlp.rs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/util/benches/rlp.rs b/util/benches/rlp.rs index d2ecb4553..e322143f7 100644 --- a/util/benches/rlp.rs +++ b/util/benches/rlp.rs @@ -3,7 +3,7 @@ //! ```bash //! multirust run nightly cargo bench //! ``` -/* + #![feature(test)] extern crate test; @@ -94,4 +94,3 @@ fn bench_stream_1000_empty_lists(b: &mut Bencher) { let _ = stream.out(); }); } -*/ \ No newline at end of file