diff options
| author | наб <[email protected]> | 2022-04-10 02:46:19 +0200 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2022-05-10 10:20:09 -0700 |
| commit | 0425d58852a4b834b1813e0feb1a1ba6d5b72de8 (patch) | |
| tree | 23cd4cf85b5e12a58dccab88f96544a0ffcde19f /config/Shellcheck.am | |
| parent | 48f4379974d5b28bba9c22fcf3bab6ceb2844ff7 (diff) | |
autoconf: use include directives instead of recursing down tests (mostly)
Only down to tests/zfs-tests/tests, but pull out C programs into the
main Makefile ‒ this means we get correct dependency tracking for all
programs (and parallelise across them)
dist diff:
-zfs-2.1.99/tests/zfs-tests/tests/stress/
-zfs-2.1.99/tests/zfs-tests/tests/stress/Makefile.am
-zfs-2.1.99/tests/zfs-tests/tests/stress/Makefile.in
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Ahelenia Ziemiańska <[email protected]>
Closes #13316
Diffstat (limited to 'config/Shellcheck.am')
| -rw-r--r-- | config/Shellcheck.am | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/config/Shellcheck.am b/config/Shellcheck.am index 9002b76de..878919575 100644 --- a/config/Shellcheck.am +++ b/config/Shellcheck.am @@ -12,10 +12,7 @@ JUST_SHELLCHECK_OPTS = $(addprefix shellcheck-here-,$(subst /,^,$(1))) JUST_CHECKBASHISMS_OPTS = $(addprefix checkbashisms-here-,$(subst /,^,$(1))) SHELLCHECK_OPTS = $(call JUST_SHELLCHECK_OPTS,$(1)) $(call JUST_CHECKBASHISMS_OPTS,$(1)) -PHONY += shellcheck shellcheck-recursive - -shellcheck-recursive: - @set -e; for dir in $(SHELLCHECKDIRS); do $(MAKE) -C $$dir shellcheck; done +PHONY += shellcheck _STGT = $(subst ^,/,$(subst shellcheck-here-,,$@)) shellcheck-here-%: @@ -25,13 +22,10 @@ else @echo "skipping shellcheck of" $(_STGT) "because shellcheck is not installed" endif -shellcheck: $(SHELLCHECKSCRIPTS) $(call JUST_SHELLCHECK_OPTS,$(SHELLCHECKSCRIPTS)) shellcheck-recursive - +shellcheck: $(SHELLCHECKSCRIPTS) $(call JUST_SHELLCHECK_OPTS,$(SHELLCHECKSCRIPTS)) -PHONY += checkbashisms checkbashisms-recursive -checkbashisms-recursive: - @set -e; for dir in $(SHELLCHECKDIRS); do $(MAKE) -C $$dir checkbashisms; done +PHONY += checkbashisms # command -v *is* specified by POSIX and every shell in existence supports it _BTGT = $(subst ^,/,$(subst checkbashisms-here-,,$@)) @@ -43,4 +37,4 @@ else @echo "skipping checkbashisms of" $(_BTGT) "because checkbashisms is not installed" endif -checkbashisms: $(SHELLCHECKSCRIPTS) $(call JUST_CHECKBASHISMS_OPTS,$(SHELLCHECKSCRIPTS)) checkbashisms-recursive +checkbashisms: $(SHELLCHECKSCRIPTS) $(call JUST_CHECKBASHISMS_OPTS,$(SHELLCHECKSCRIPTS)) |