Skip to content

Commit

Permalink
Allow make checkstyle and paxscript in build dir
Browse files Browse the repository at this point in the history
Reviewed-by: Giuseppe Di Natale <[email protected]>
Reviewed-by: Brian Behlendorf <[email protected]>
Reviewed-by: George Melikov <[email protected]>
Signed-off-by: Chris Dunlop <[email protected]>
Closes #7202
  • Loading branch information
chrisrd authored and behlendorf committed Feb 21, 2018
1 parent faa97c1 commit 26cb4b8
Showing 1 changed file with 7 additions and 6 deletions.
13 changes: 7 additions & 6 deletions Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -45,19 +45,20 @@ checkstyle: cstyle shellcheck flake8 commitcheck mancheck testscheck

commitcheck:
@if git rev-parse --git-dir > /dev/null 2>&1; then \
scripts/commitcheck.sh; \
${top_srcdir}/scripts/commitcheck.sh; \
fi

cstyle:
@find ${top_srcdir} -name '*.[hc]' ! -name 'zfs_config.*' \
! -name '*.mod.c' -type f -exec scripts/cstyle.pl -cpP {} \+
! -name '*.mod.c' -type f \
-exec ${top_srcdir}/scripts/cstyle.pl -cpP {} \+

shellcheck:
@if type shellcheck > /dev/null 2>&1; then \
shellcheck --exclude=SC1090 --format=gcc \
$$(find scripts/*.sh -type f) \
$$(find cmd/zed/zed.d/*.sh -type f) \
$$(find cmd/zpool/zpool.d/* -executable); \
$$(find ${top_srcdir}/scripts/*.sh -type f) \
$$(find ${top_srcdir}/cmd/zed/zed.d/*.sh -type f) \
$$(find ${top_srcdir}/cmd/zpool/zpool.d/* -executable); \
fi

mancheck:
Expand Down Expand Up @@ -88,7 +89,7 @@ cppcheck:

paxcheck:
@if type scanelf > /dev/null 2>&1; then \
scripts/paxcheck.sh ${top_srcdir}; \
${top_srcdir}/scripts/paxcheck.sh ${top_srcdir}; \
fi

flake8:
Expand Down

0 comments on commit 26cb4b8

Please sign in to comment.