osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

autotools: dispense if-else shellcheck test 

Change-Id: I1fd63442b27460ef21b2aaf4e3639a7d12c72c6e
Reviewed-on: https://code.wireshark.org/review/23908
Reviewed-by: João Valverde <j@v6e.pt>
This commit is contained in:
João Valverde 2017-10-14 11:48:07 +01:00 committed by João Valverde
parent d4b0fb5773
commit 5842fe4afe
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile.am
View File

@ -1114,21 +1114,15 @@ checkapi: checkapi_local
cd writecap && $(MAKE) checkapi
cd wsutil && $(MAKE) checkapi
if HAVE_SHELLCHECK
# --external-sources requires 0.4.0 or later.
shellcheck:
cd $(top_srcdir) && \
shellcheck --external-sources \
$(SHELLCHECK) --external-sources \
tools/fuzz-test.sh \
tools/randpkt-test.sh \
tools/runa2x.sh \
tools/test-captures.sh \
tools/valgrind-wireshark.sh
else
shellcheck:
@echo "Shellcheck not available." ; \
false
endif
wsar_html: doxygen.cfg doxygen_global.cfg FORCE
if HAVE_DOXYGEN

3
configure.ac
View File

@ -495,8 +495,7 @@ AC_CHECK_PROG(have_sw_vers, sw_vers, "yes", "no")
AM_CONDITIONAL(NOT_MACOS, test "x$have_sw_vers" = "xno")
# Shellcheck
AC_CHECK_PROG(HAVE_SHELLCHECK, shellcheck, "yes", "no")
AM_CONDITIONAL(HAVE_SHELLCHECK, test x$HAVE_SHELLCHECK = xyes)
AC_CHECK_PROGS(SHELLCHECK, shellcheck, shellcheck)
#
# Check compiler vendor. For GCC this will be 'gnu' and for Clang 'clang'.