diff options
| author | Nick Mathewson <nickm@torproject.org> | 2019-01-15 08:08:41 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2019-01-15 08:08:41 -0500 |
| commit | c281e587bb1b4ac1bdaa97ea68c1ab0c80fe4bab (patch) | |
| tree | 42690b680a8fff3a9b0711849ac333c7adeb850c | |
| parent | b169c8c14f23394b40305f38ee4ce08add278e27 (diff) | |
| parent | 30a925fe96ed69284a915c8e80d0f7ef7b556786 (diff) | |
| download | tor-c281e587bb1b4ac1bdaa97ea68c1ab0c80fe4bab.tar.gz tor-c281e587bb1b4ac1bdaa97ea68c1ab0c80fe4bab.zip | |
Merge branch 'ticket28058_squashed'
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | Makefile.am | 11 | ||||
| -rw-r--r-- | changes/ticket28058 | 2 |
3 files changed, 14 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index 2ea529e252..474f6867fd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -131,6 +131,7 @@ addons: - docbook-xsl - docbook-xml - xmlto + - shellcheck ## (OSX only) homebrew: packages: @@ -154,6 +155,7 @@ addons: ## Always installed, because manual brew installs are hard to get right - asciidoc - xmlto + - shellcheck ## (OSX only) Use the default OSX image ## See https://docs.travis-ci.com/user/reference/osx#os-x-version diff --git a/Makefile.am b/Makefile.am index 84050f8b34..a5086b3035 100644 --- a/Makefile.am +++ b/Makefile.am @@ -215,7 +215,16 @@ doxygen: test: all $(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: @if test ! -d "$$CHUTNEY_PATH"; then \ diff --git a/changes/ticket28058 b/changes/ticket28058 new file mode 100644 index 0000000000..00ac595864 --- /dev/null +++ b/changes/ticket28058 @@ -0,0 +1,2 @@ + o Testing: + - Run shellcheck for stuff in scripts/ directory. Closes ticket 28058. |