forked from openzfs/zfs
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
autoconf: use include directives instead of recursing down tests (mos…
…tly) 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 openzfs#13316
- Loading branch information
1 parent
48f4379
commit 0425d58
Showing
19 changed files
with
169 additions
and
253 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,30 @@ | ||
| PHONY = | ||
| include $(top_srcdir)/config/Shellcheck.am | ||
| include $(srcdir)/%D%/zfs-tests/Makefile.am | ||
|
|
||
| SUBDIRS = runfiles test-runner zfs-tests | ||
|
|
||
| EXTRA_DIST = README.md | ||
| scripts_test_runner_bindir = $(datadir)/$(PACKAGE)/test-runner/bin | ||
| scripts_test_runner_bin_SCRIPTS = \ | ||
| %D%/test-runner/bin/test-runner.py \ | ||
| %D%/test-runner/bin/zts-report.py | ||
|
|
||
| SHELLCHECKSCRIPTS += $(shell find $(srcdir) -name '*.sh') | ||
| SUBSTFILES += $(scripts_test_runner_bin_SCRIPTS) | ||
|
|
||
|
|
||
| scripts_test_runner_includedir = $(datadir)/$(PACKAGE)/test-runner/include | ||
| dist_scripts_test_runner_include_DATA = \ | ||
| %D%/test-runner/include/logapi.shlib | ||
|
|
||
|
|
||
| scripts_runfilesdir = $(datadir)/$(PACKAGE)/runfiles | ||
| dist_scripts_runfiles_DATA = \ | ||
| %D%/runfiles/common.run \ | ||
| %D%/runfiles/freebsd.run \ | ||
| %D%/runfiles/linux.run \ | ||
| %D%/runfiles/longevity.run \ | ||
| %D%/runfiles/perf-regression.run \ | ||
| %D%/runfiles/sanity.run \ | ||
| %D%/runfiles/sunos.run | ||
|
|
||
|
|
||
| EXTRA_DIST += $(addprefix %D%/,README.md) | ||
|
|
||
| SHELLCHECKSCRIPTS += $(shell find $(srcdir)/%D% -name '*.sh') |
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1,48 @@ | ||
| SUBDIRS = cmd include tests callbacks | ||
| SUBDIRS += %D%/tests | ||
|
|
||
| include $(srcdir)/%D%/cmd/Makefile.am | ||
|
|
||
|
|
||
| scripts_zfs_tests_functional_libzfsdir = $(datadir)/$(PACKAGE)/zfs-tests/tests/functional/libzfs | ||
| scripts_zfs_tests_functional_libzfs_PROGRAMS = %D%/tests/functional/libzfs/many_fds | ||
| %C%_tests_functional_libzfs_many_fds_LDADD = \ | ||
| libzfs.la | ||
|
|
||
| scripts_zfs_tests_functional_hkdfdir = $(datadir)/$(PACKAGE)/zfs-tests/tests/functional/hkdf | ||
| scripts_zfs_tests_functional_hkdf_PROGRAMS = %D%/tests/functional/hkdf/hkdf_test | ||
| %C%_tests_functional_hkdf_hkdf_test_LDADD = \ | ||
| libzpool.la | ||
|
|
||
| if BUILD_LINUX | ||
| scripts_zfs_tests_functional_tmpfiledir = $(datadir)/$(PACKAGE)/zfs-tests/tests/functional/tmpfile | ||
| scripts_zfs_tests_functional_tmpfile_PROGRAMS = \ | ||
| %D%/tests/functional/tmpfile/tmpfile_001_pos \ | ||
| %D%/tests/functional/tmpfile/tmpfile_002_pos \ | ||
| %D%/tests/functional/tmpfile/tmpfile_003_pos \ | ||
| %D%/tests/functional/tmpfile/tmpfile_stat_mode \ | ||
| %D%/tests/functional/tmpfile/tmpfile_test | ||
| endif | ||
|
|
||
|
|
||
| scripts_zfs_tests_callbacksdir = $(datadir)/$(PACKAGE)/zfs-tests/callbacks | ||
| dist_scripts_zfs_tests_callbacks_SCRIPTS = \ | ||
| %D%/callbacks/zfs_dbgmsg.ksh \ | ||
| %D%/callbacks/zfs_dmesg.ksh \ | ||
| %D%/callbacks/zfs_failsafe.ksh \ | ||
| %D%/callbacks/zfs_mmp.ksh | ||
|
|
||
|
|
||
| scripts_zfs_tests_includedir = $(datadir)/$(PACKAGE)/zfs-tests/include | ||
| dist_scripts_zfs_tests_include_DATA = \ | ||
| %D%/include/blkdev.shlib \ | ||
| %D%/include/commands.cfg \ | ||
| %D%/include/libtest.shlib \ | ||
| %D%/include/math.shlib \ | ||
| %D%/include/properties.shlib \ | ||
| %D%/include/tunables.cfg \ | ||
| %D%/include/zpool_script.shlib | ||
|
|
||
| nodist_scripts_zfs_tests_include_DATA = \ | ||
| %D%/include/default.cfg | ||
|
|
||
| SUBSTFILES += $(nodist_scripts_zfs_tests_include_DATA) |
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.