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

Merge branch 'ticket28058_squashed'

parents b169c8c1 30a925fe

.travis.yml

+2 −0
Original line number Diff line number Diff line
@@ -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

Makefile.am

+10 −1
Original line number Diff line number Diff line
@@ -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 \

changes/ticket28058

0 → 100644
+2 −0
Original line number Diff line number Diff line 
  o Testing:

    - Run shellcheck for stuff in scripts/ directory. Closes ticket 28058.