Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Move test-runner.1 into top-level man/ 

dist delta:
  +zfs-2.1.99/man/man1/test-runner.1
  -zfs-2.1.99/tests/test-runner/man/
  -zfs-2.1.99/tests/test-runner/man/test-runner.1

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
Closes #13316
This commit is contained in:
наб 2022-04-09 19:20:52 +02:00 committed by Brian Behlendorf
parent 0f6c4fd00e
commit 93a8c85e7b
6 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
Makefile.am
View File

@ -2,6 +2,7 @@ CLEANFILES =
EXTRA_DIST = EXTRA_DIST =
INSTALL_DATA_HOOKS = INSTALL_DATA_HOOKS =
ALL_LOCAL = ALL_LOCAL =
CHECKS = shellcheck checkbashisms
include $(top_srcdir)/config/Shellcheck.am include $(top_srcdir)/config/Shellcheck.am
include $(top_srcdir)/config/Rules.am include $(top_srcdir)/config/Rules.am
@ -93,8 +94,11 @@ dist-hook:
$(top_srcdir)/scripts/make_gitrev.sh -D $(distdir) $(GITREV) $(top_srcdir)/scripts/make_gitrev.sh -D $(distdir) $(GITREV)
$(SED) $(ac_inplace) 's/\(Release:[[:space:]]*\).*/\1$(RELEASE)/' $(distdir)/META $(SED) $(ac_inplace) 's/\(Release:[[:space:]]*\).*/\1$(RELEASE)/' $(distdir)/META
PHONY += codecheck PHONY += codecheck $(CHECKS)
codecheck: cstyle shellcheck checkbashisms flake8 mancheck testscheck vcscheck zstdcheck codecheck: $(CHECKS)
SHELLCHECKDIRS = contrib etc tests
SHELLCHECKSCRIPTS += autogen.sh
PHONY += checkstyle PHONY += checkstyle
checkstyle: codecheck commitcheck checkstyle: codecheck commitcheck
@ -110,7 +114,7 @@ cstyle_line = -print0 | parallel -X0 ${top_srcdir}/scripts/cstyle.pl -cpP {}
else else
cstyle_line = -exec ${top_srcdir}/scripts/cstyle.pl -cpP {} + cstyle_line = -exec ${top_srcdir}/scripts/cstyle.pl -cpP {} +
endif endif
PHONY += cstyle CHECKS += cstyle
cstyle: cstyle:
@find ${top_srcdir} -name build -prune \ @find ${top_srcdir} -name build -prune \
-o -type f -name '*.[hc]' \ -o -type f -name '*.[hc]' \
@ -124,31 +128,23 @@ cstyle:
$(cstyle_line) $(cstyle_line)
filter_executable = -exec test -x '{}' \; -print filter_executable = -exec test -x '{}' \; -print
CHECKS += testscheck
SHELLCHECKDIRS = contrib etc tests
SHELLCHECKSCRIPTS += autogen.sh
PHONY += mancheck
mancheck:
$(top_srcdir)/scripts/mancheck.sh $(top_srcdir)/man $(top_srcdir)/tests/test-runner/man
PHONY += testscheck
testscheck: testscheck:
@[ $$(find ${top_srcdir}/tests/zfs-tests -type f \ @[ $$(find $(top_srcdir)/tests/zfs-tests -type f \
\( -name '*.ksh' -not ${filter_executable} \) -o \ \( -name '*.ksh' -not $(filter_executable) \) -o \
\( -name '*.kshlib' ${filter_executable} \) -o \ \( -name '*.kshlib' $(filter_executable) \) -o \
\( -name '*.shlib' ${filter_executable} \) -o \ \( -name '*.shlib' $(filter_executable) \) -o \
\( -name '*.cfg' ${filter_executable} \) | \ \( -name '*.cfg' $(filter_executable) \) | \
tee /dev/stderr | wc -l) -eq 0 ] tee /dev/stderr | wc -l) -eq 0 ]
PHONY += vcscheck CHECKS += vcscheck
vcscheck: vcscheck:
@if git rev-parse --git-dir > /dev/null 2>&1; then \ @if git rev-parse --git-dir > /dev/null 2>&1; then \
git ls-files . --exclude-standard --others | \ git ls-files . --exclude-standard --others | \
awk '{c++; print} END {if(c>0) exit 1}' ; \ awk '{c++; print} END {if(c>0) exit 1}' ; \
fi fi
PHONY += zstdcheck CHECKS += zstdcheck
zstdcheck: zstdcheck:
@$(MAKE) -C module check-zstd-symbols @$(MAKE) -C module check-zstd-symbols
@ -163,7 +159,7 @@ paxcheck:
echo "skipping paxcheck because scanelf is not installed"; \ echo "skipping paxcheck because scanelf is not installed"; \
fi fi
PHONY += flake8 CHECKS += flake8
flake8: flake8:
@if type flake8 > /dev/null 2>&1; then \ @if type flake8 > /dev/null 2>&1; then \
flake8 ${top_srcdir}; \ flake8 ${top_srcdir}; \

1
configure.ac
View File

@ -111,7 +111,6 @@ AC_CONFIG_FILES([
tests/test-runner/Makefile tests/test-runner/Makefile
tests/test-runner/bin/Makefile tests/test-runner/bin/Makefile
tests/test-runner/include/Makefile tests/test-runner/include/Makefile
tests/test-runner/man/Makefile
tests/zfs-tests/Makefile tests/zfs-tests/Makefile
tests/zfs-tests/callbacks/Makefile tests/zfs-tests/callbacks/Makefile
tests/zfs-tests/cmd/Makefile tests/zfs-tests/cmd/Makefile

6
man/Makefile.am
View File

@ -4,6 +4,7 @@ EXTRA_DIST += \
dist_man_MANS = \ dist_man_MANS = \
%D%/man1/arcstat.1 \ %D%/man1/arcstat.1 \
%D%/man1/raidz_test.1 \ %D%/man1/raidz_test.1 \
%D%/man1/test-runner.1 \
%D%/man1/zhack.1 \ %D%/man1/zhack.1 \
%D%/man1/ztest.1 \ %D%/man1/ztest.1 \
%D%/man1/zvol_wait.1 \ %D%/man1/zvol_wait.1 \
@ -107,6 +108,11 @@ nodist_man_MANS = \
SUBSTFILES += $(nodist_man_MANS) SUBSTFILES += $(nodist_man_MANS)
CHECKS += mancheck
mancheck:
$(top_srcdir)/scripts/mancheck.sh $(srcdir)/%D%
if BUILD_LINUX if BUILD_LINUX
# The manual pager in most Linux distros defaults to "BSD" when .Os is blank, # The manual pager in most Linux distros defaults to "BSD" when .Os is blank,
# but leaving it blank makes things a lot easier on # but leaving it blank makes things a lot easier on

0
tests/test-runner/man/test-runner.1 → man/man1/test-runner.1
View File

2
tests/test-runner/Makefile.am
View File

@ -1 +1 @@
SUBDIRS = bin include man SUBDIRS = bin include

1
tests/test-runner/man/Makefile.am
View File

@ -1 +0,0 @@
dist_man_MANS = test-runner.1