Merge branch 'maint-0.4.0'

This commit is contained in:
Nick Mathewson 2019-04-29 10:15:11 -04:00
commit 206d28ff15
2 changed files with 4 additions and 1 deletions

View File

@ -226,7 +226,7 @@ shellcheck:
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; \
shellcheck $(top_srcdir)/scripts/test/cov-diff $(top_srcdir)/scripts/test/coverage; \
fi; \
fi

3
changes/bug30263 Normal file
View File

@ -0,0 +1,3 @@
o Minor bugfixes (shellcheck):
- Stop looking for scripts in the build directory during
"make shellcheck". Fixes bug 30263; bugfix on 0.4.0.1-alpha.