From 93a8c85e7bf5acfc3d2d9c6fade77c921c4ae396 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=BD=D0=B0=D0=B1?= <nabijaczleweli@nabijaczleweli.xyz>
Date: Sat, 9 Apr 2022 19:20:52 +0200
Subject: [PATCH] Move test-runner.1 into top-level man/
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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
---
 Makefile.am                                   | 36 +++++++++----------
 configure.ac                                  |  1 -
 man/Makefile.am                               |  6 ++++
 .../man => man/man1}/test-runner.1            |  0
 tests/test-runner/Makefile.am                 |  2 +-
 tests/test-runner/man/Makefile.am             |  1 -
 6 files changed, 23 insertions(+), 23 deletions(-)
 rename {tests/test-runner/man => man/man1}/test-runner.1 (100%)
 delete mode 100644 tests/test-runner/man/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 89f258a1d8..09d5a6b804 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,6 +2,7 @@ CLEANFILES =
 EXTRA_DIST =
 INSTALL_DATA_HOOKS =
 ALL_LOCAL =
+CHECKS = shellcheck checkbashisms
 
 include $(top_srcdir)/config/Shellcheck.am
 include $(top_srcdir)/config/Rules.am
@@ -93,8 +94,11 @@ dist-hook:
 	$(top_srcdir)/scripts/make_gitrev.sh -D $(distdir) $(GITREV)
 	$(SED) $(ac_inplace) 's/\(Release:[[:space:]]*\).*/\1$(RELEASE)/' $(distdir)/META
 
-PHONY += codecheck
-codecheck: cstyle shellcheck checkbashisms flake8 mancheck testscheck vcscheck zstdcheck
+PHONY += codecheck $(CHECKS)
+codecheck: $(CHECKS)
+
+SHELLCHECKDIRS = contrib etc tests
+SHELLCHECKSCRIPTS += autogen.sh
 
 PHONY += checkstyle
 checkstyle: codecheck commitcheck
@@ -110,7 +114,7 @@ cstyle_line = -print0 | parallel -X0 ${top_srcdir}/scripts/cstyle.pl -cpP {}
 else
 cstyle_line = -exec ${top_srcdir}/scripts/cstyle.pl -cpP {} +
 endif
-PHONY += cstyle
+CHECKS += cstyle
 cstyle:
 	@find ${top_srcdir} -name build -prune \
 		-o -type f -name '*.[hc]' \
@@ -124,31 +128,23 @@ cstyle:
 		$(cstyle_line)
 
 filter_executable = -exec test -x '{}' \; -print
-
-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
+CHECKS += testscheck
 testscheck:
-	@[ $$(find ${top_srcdir}/tests/zfs-tests -type f \
-		\( -name '*.ksh' -not ${filter_executable} \) -o \
-		\( -name '*.kshlib' ${filter_executable} \) -o \
-		\( -name '*.shlib' ${filter_executable} \) -o \
-		\( -name '*.cfg' ${filter_executable} \) | \
+	@[ $$(find $(top_srcdir)/tests/zfs-tests -type f \
+		\( -name '*.ksh' -not $(filter_executable) \) -o \
+		\( -name '*.kshlib' $(filter_executable) \) -o \
+		\( -name '*.shlib' $(filter_executable) \) -o \
+		\( -name '*.cfg' $(filter_executable) \) | \
 		tee /dev/stderr | wc -l) -eq 0 ]
 
-PHONY += vcscheck
+CHECKS += vcscheck
 vcscheck:
 	@if git rev-parse --git-dir > /dev/null 2>&1; then \
 		git ls-files . --exclude-standard --others | \
 		awk '{c++; print} END {if(c>0) exit 1}' ; \
 	fi
 
-PHONY += zstdcheck
+CHECKS += zstdcheck
 zstdcheck:
 	@$(MAKE) -C module check-zstd-symbols
 
@@ -163,7 +159,7 @@ paxcheck:
 		echo "skipping paxcheck because scanelf is not installed"; \
 	fi
 
-PHONY += flake8
+CHECKS += flake8
 flake8:
 	@if type flake8 > /dev/null 2>&1; then \
 		flake8 ${top_srcdir}; \
diff --git a/configure.ac b/configure.ac
index 42f6fa6198..dd1f63f492 100644
--- a/configure.ac
+++ b/configure.ac
@@ -111,7 +111,6 @@ AC_CONFIG_FILES([
 	tests/test-runner/Makefile
 	tests/test-runner/bin/Makefile
 	tests/test-runner/include/Makefile
-	tests/test-runner/man/Makefile
 	tests/zfs-tests/Makefile
 	tests/zfs-tests/callbacks/Makefile
 	tests/zfs-tests/cmd/Makefile
diff --git a/man/Makefile.am b/man/Makefile.am
index 86e23c58f1..362ee9b7e1 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -4,6 +4,7 @@ EXTRA_DIST += \
 dist_man_MANS = \
 	%D%/man1/arcstat.1 \
 	%D%/man1/raidz_test.1 \
+	%D%/man1/test-runner.1 \
 	%D%/man1/zhack.1 \
 	%D%/man1/ztest.1 \
 	%D%/man1/zvol_wait.1 \
@@ -107,6 +108,11 @@ nodist_man_MANS = \
 SUBSTFILES += $(nodist_man_MANS)
 
 
+CHECKS += mancheck
+mancheck:
+	$(top_srcdir)/scripts/mancheck.sh $(srcdir)/%D%
+
+
 if BUILD_LINUX
 # The manual pager in most Linux distros defaults to "BSD" when .Os is blank,
 # but leaving it blank makes things a lot easier on
diff --git a/tests/test-runner/man/test-runner.1 b/man/man1/test-runner.1
similarity index 100%
rename from tests/test-runner/man/test-runner.1
rename to man/man1/test-runner.1
diff --git a/tests/test-runner/Makefile.am b/tests/test-runner/Makefile.am
index db3d966142..4d4b639dbe 100644
--- a/tests/test-runner/Makefile.am
+++ b/tests/test-runner/Makefile.am
@@ -1 +1 @@
-SUBDIRS = bin include man
+SUBDIRS = bin include
diff --git a/tests/test-runner/man/Makefile.am b/tests/test-runner/man/Makefile.am
deleted file mode 100644
index 503a5694f4..0000000000
--- a/tests/test-runner/man/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-dist_man_MANS = test-runner.1