From 5f24bed92d820bd4fb53be179741990a83cfcbf7 Mon Sep 17 00:00:00 2001 From: NikVolf Date: Thu, 15 Dec 2016 11:55:18 +0100 Subject: [PATCH] using one-line folds --- .travis.yml | 6 ++---- tools/bench.sh | 3 +-- tools/regtests.sh | 5 ++--- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index ca32d66b..3a82e793 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,12 +25,10 @@ addons: - g++-4.8 - oracle-java8-set-default script: - - echo -en 'travis_fold:start:tests' - - echo Running tests from /tools/test.sh + - echo 'Running tests from /tools/test.sh' && echo -en 'travis_fold:start:tests' - ./tools/test.sh - echo -en 'travis_fold:end:tests' - - echo -en 'travis_fold:start:build.release' - - echo Building in release mode + - echo 'Building in release mode' && echo -en 'travis_fold:start:build.release' - cargo build --release - echo -en 'travis_fold:end:build.release' - ./tools/bench.sh diff --git a/tools/bench.sh b/tools/bench.sh index 5b541766..f4c4f50c 100755 --- a/tools/bench.sh +++ b/tools/bench.sh @@ -1,5 +1,4 @@ #!/bin/bash -echo -en 'travis_fold:start:bench' -echo 'Running bench from /benhcer' +echo 'Running bench from /benhcer' && echo -en 'travis_fold:start:bench' cargo run --manifest-path ./bencher/Cargo.toml --release echo -en 'travis_fold:end:bench' diff --git a/tools/regtests.sh b/tools/regtests.sh index ed8396f5..dcae0123 100755 --- a/tools/regtests.sh +++ b/tools/regtests.sh @@ -1,7 +1,6 @@ #!/bin/bash -echo -en 'travis_fold:start:Regtests' -echo 'Running regtests from ./tools/compare-tool/pull-tests-be0eef7.jar' +echo 'Running regtests from ./tools/compare-tool/pull-tests-be0eef7.jar' && echo -en 'travis_fold:start:regtests' ./target/release/pbtc --regtest --db-cache=192 & ! java -jar ./tools/compare-tool/pull-tests-be0eef7.jar /tmp/regtest-db 2>&1 | tee regtests-full.log | grep -E --color=auto 'org.bitcoinj.store.BlockStoreException\:|BitcoindComparisonTool.main\: ERROR|bitcoind sent us a block it already had, make sure bitcoind has no blocks!|java.lang.NullPointerException' @@ -18,7 +17,7 @@ else GREP_COLOR="01;32" grep -E "BitcoindComparisonTool.main: Block \"b[0-9]*\" completed processing" regtests-full.log fi -echo -en 'travis_fold:end:Regtests' +echo -en 'travis_fold:end:regtests' pkill -f ./target/release/pbtc exit "$result"