Commit c281e587 authored by Nick Mathewson's avatar Nick Mathewson 👁
Browse files

Merge branch 'ticket28058_squashed'

parents b169c8c1 30a925fe
...@@ -131,6 +131,7 @@ addons: ...@@ -131,6 +131,7 @@ addons:
- docbook-xsl - docbook-xsl
- docbook-xml - docbook-xml
- xmlto - xmlto
- shellcheck
## (OSX only) ## (OSX only)
homebrew: homebrew:
packages: packages:
...@@ -154,6 +155,7 @@ addons: ...@@ -154,6 +155,7 @@ addons:
## Always installed, because manual brew installs are hard to get right ## Always installed, because manual brew installs are hard to get right
- asciidoc - asciidoc
- xmlto - xmlto
- shellcheck
## (OSX only) Use the default OSX image ## (OSX only) Use the default OSX image
## See https://docs.travis-ci.com/user/reference/osx#os-x-version ## See https://docs.travis-ci.com/user/reference/osx#os-x-version
......
...@@ -215,7 +215,16 @@ doxygen: ...@@ -215,7 +215,16 @@ doxygen:
test: all test: all
$(top_builddir)/src/test/test $(top_builddir)/src/test/test
check-local: check-spaces check-changes check-includes shellcheck:
# Only use shellcheck if it is present
if command -v shellcheck; then \
find $(top_srcdir)/scripts/ -name "*.sh" -exec shellcheck {} +; \
if [ -d "$(top_srcdir)/scripts/test" ]; then \
shellcheck $(top_srcdir)/scripts/test/cov-diff $(top_builddir)/scripts/test/coverage; \
fi; \
fi
check-local: check-spaces check-changes check-includes shellcheck
need-chutney-path: need-chutney-path:
@if test ! -d "$$CHUTNEY_PATH"; then \ @if test ! -d "$$CHUTNEY_PATH"; then \
......
o Testing:
- Run shellcheck for stuff in scripts/ directory. Closes ticket 28058.
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment