commit 1941747db8b14885ae0dfed40b8e5425e47bee2d Merge: fa9588e dc4a018 Author: teor teor@torproject.org Date: Fri Apr 12 12:41:50 2019 +1000
Merge remote-tracking branch 'tor-github/pr/21'
Merged the shellcheck and unit tests. Put shellcheck first.
.travis.yml | 9 +++++++++ chutney | 6 ++++-- tests/shellcheck-tests.sh | 26 +++++++++++++++++++++++++ tools/bootstrap-network.sh | 9 +++++---- tools/hsaddress.sh | 11 ++++++----- tools/warnings.sh | 48 +++++++++++++++++++++++++--------------------- 6 files changed, 76 insertions(+), 33 deletions(-)
diff --cc .travis.yml index 812ca82,fd04d7d..f5c1d62 --- a/.travis.yml +++ b/.travis.yml @@@ -163,7 -171,7 +171,8 @@@ install - tor --version
script: + - tests/shellcheck-tests.sh + - tests/unit-tests.sh - tools/test-network.sh --allow-failures 1
after_failure: