From 0425d58852a4b834b1813e0feb1a1ba6d5b72de8 Mon Sep 17 00:00:00 2001 From: наб Date: Sun, 10 Apr 2022 02:46:19 +0200 Subject: autoconf: use include directives instead of recursing down tests (mostly) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Signed-off-by: Ahelenia Ziemiańska Closes #13316 --- tests/test-runner/Makefile.am | 1 - tests/test-runner/bin/Makefile.am | 10 ---------- tests/test-runner/include/Makefile.am | 4 ---- 3 files changed, 15 deletions(-) delete mode 100644 tests/test-runner/Makefile.am delete mode 100644 tests/test-runner/bin/Makefile.am delete mode 100644 tests/test-runner/include/Makefile.am (limited to 'tests/test-runner') diff --git a/tests/test-runner/Makefile.am b/tests/test-runner/Makefile.am deleted file mode 100644 index 4d4b639db..000000000 --- a/tests/test-runner/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS = bin include diff --git a/tests/test-runner/bin/Makefile.am b/tests/test-runner/bin/Makefile.am deleted file mode 100644 index 74b98fa69..000000000 --- a/tests/test-runner/bin/Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ -CLEANFILES = -EXTRA_DIST = -include $(top_srcdir)/config/Substfiles.am - -pkgdatadir = $(datadir)/@PACKAGE@/test-runner/bin -pkgdata_SCRIPTS = \ - test-runner.py \ - zts-report.py - -SUBSTFILES += $(pkgdata_SCRIPTS) diff --git a/tests/test-runner/include/Makefile.am b/tests/test-runner/include/Makefile.am deleted file mode 100644 index 62817ded8..000000000 --- a/tests/test-runner/include/Makefile.am +++ /dev/null @@ -1,4 +0,0 @@ -pkgdatadir = $(datadir)/@PACKAGE@/test-runner/include - -dist_pkgdata_DATA = \ - logapi.shlib -- cgit v1.2.3