d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

autoconf: use include directives instead of recursing down tests (mostly)

Browse Source 
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 <behlendorf1@llnl.gov>
Signed-off-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
Closes #13316
This commit is contained in:
наб 2022-04-10 02:46:19 +02:00 committed by Brian Behlendorf
parent 48f4379974
commit 0425d58852
19 changed files with 174 additions and 258 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile.am
View File

@ -17,13 +17,13 @@ include $(srcdir)/%D%/rpm/Makefile.am
endif
if CONFIG_USER
SUBDIRS += . tests
include $(srcdir)/%D%/cmd/Makefile.am
include $(srcdir)/%D%/contrib/Makefile.am
include $(srcdir)/%D%/etc/Makefile.am
include $(srcdir)/%D%/lib/Makefile.am
include $(srcdir)/%D%/man/Makefile.am
include $(srcdir)/%D%/scripts/Makefile.am
include $(srcdir)/%D%/tests/Makefile.am
if BUILD_LINUX
include $(srcdir)/%D%/udev/Makefile.am
endif
@ -98,7 +98,6 @@ dist-hook:
PHONY += codecheck $(CHECKS)
codecheck: $(CHECKS)
SHELLCHECKDIRS = tests
SHELLCHECKSCRIPTS += autogen.sh
PHONY += checkstyle

2
config/CppCheck.am
View File

@ -11,7 +11,7 @@ CPPCHECKDIRS =
CPPCHECKTARGETS =
cppcheck-recursive-%:
$(MAKE) -C $(subst ^,/,$(subst cppcheck-recursive-,,$@)) cppcheck
$(MAKE) -C $(subst cppcheck-recursive-,,$@) cppcheck
_CTGT = $(subst cppcheck-for-,,$@)
cppcheck-for-%:

14
config/Shellcheck.am
View File

@ -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))

11
configure.ac
View File

@ -78,15 +78,6 @@ AC_CONFIG_FILES([
rpm/redhat/zfs-dkms.spec
rpm/redhat/zfs-kmod.spec
rpm/redhat/zfs.spec
tests/Makefile
tests/runfiles/Makefile
tests/test-runner/Makefile
tests/test-runner/bin/Makefile
tests/test-runner/include/Makefile
tests/zfs-tests/Makefile
tests/zfs-tests/callbacks/Makefile
tests/zfs-tests/cmd/Makefile
tests/zfs-tests/include/Makefile
tests/zfs-tests/tests/Makefile
tests/zfs-tests/tests/functional/Makefile
tests/zfs-tests/tests/functional/acl/Makefile
@ -196,7 +187,6 @@ AC_CONFIG_FILES([
tests/zfs-tests/tests/functional/features/large_dnode/Makefile
tests/zfs-tests/tests/functional/grow/Makefile
tests/zfs-tests/tests/functional/history/Makefile
tests/zfs-tests/tests/functional/hkdf/Makefile
tests/zfs-tests/tests/functional/inheritance/Makefile
tests/zfs-tests/tests/functional/inuse/Makefile
tests/zfs-tests/tests/functional/io/Makefile
@ -264,7 +254,6 @@ AC_CONFIG_FILES([
tests/zfs-tests/tests/perf/fio/Makefile
tests/zfs-tests/tests/perf/regression/Makefile
tests/zfs-tests/tests/perf/scripts/Makefile
tests/zfs-tests/tests/stress/Makefile
zfs.release
])

32
tests/Makefile.am
View File

@ -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')

9
tests/runfiles/Makefile.am
View File

@ -1,9 +0,0 @@
pkgdatadir = $(datadir)/@PACKAGE@/runfiles
dist_pkgdata_DATA = \
common.run \
freebsd.run \
linux.run \
longevity.run \
perf-regression.run \
sanity.run \
sunos.run

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

@ -1 +0,0 @@
SUBDIRS = bin include

10
tests/test-runner/bin/Makefile.am
View File

@ -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)

4
tests/test-runner/include/Makefile.am
View File

@ -1,4 +0,0 @@
pkgdatadir = $(datadir)/@PACKAGE@/test-runner/include
dist_pkgdata_DATA = \
logapi.shlib

49
tests/zfs-tests/Makefile.am
View File

@ -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)

6
tests/zfs-tests/callbacks/Makefile.am
View File

@ -1,6 +0,0 @@
pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/callbacks
dist_pkgdata_SCRIPTS = \
zfs_failsafe.ksh \
zfs_dbgmsg.ksh \
zfs_dmesg.ksh \
zfs_mmp.ksh

244
tests/zfs-tests/cmd/Makefile.am
View File

@ -1,187 +1,127 @@
include $(top_srcdir)/config/Rules.am
pkgexecdir = $(datadir)/@PACKAGE@/zfs-tests/bin
scripts_zfs_tests_bindir = $(datadir)/$(PACKAGE)/zfs-tests/bin
pkgexec_PROGRAMS = badsend
badsend_SOURCES = badsend.c
badsend_LDADD = \
$(abs_top_builddir)/libzfs_core.la \
$(abs_top_builddir)/libzfs.la \
$(abs_top_builddir)/libnvpair.la
scripts_zfs_tests_bin_PROGRAMS = %D%/chg_usr_exec
scripts_zfs_tests_bin_PROGRAMS += %D%/cp_files
scripts_zfs_tests_bin_PROGRAMS += %D%/ctime
scripts_zfs_tests_bin_PROGRAMS += %D%/dir_rd_update
scripts_zfs_tests_bin_PROGRAMS += %D%/dosmode_readonly_write
scripts_zfs_tests_bin_PROGRAMS += %D%/get_diff
scripts_zfs_tests_bin_PROGRAMS += %D%/rename_dir
scripts_zfs_tests_bin_PROGRAMS += %D%/suid_write_to_file
scripts_zfs_tests_bin_PROGRAMS += %D%/truncate_test
scripts_zfs_tests_bin_PROGRAMS += %D%/zfs_diff-socket
pkgexec_PROGRAMS += btree_test
btree_test_SOURCES = btree_test.c
btree_test_CPPFLAGS = $(AM_CPPFLAGS) $(FORCEDEBUG_CPPFLAGS)
btree_test_LDADD = \
$(abs_top_builddir)/libzpool.la \
$(abs_top_builddir)/libzfs_core.la
scripts_zfs_tests_bin_PROGRAMS += %D%/badsend
%C%_badsend_LDADD = \
libzfs_core.la \
libzfs.la \
libnvpair.la
pkgexec_PROGRAMS += chg_usr_exec
chg_usr_exec_SOURCES = chg_usr_exec.c
scripts_zfs_tests_bin_PROGRAMS += %D%/btree_test
%C%_btree_test_CPPFLAGS = $(AM_CPPFLAGS) $(FORCEDEBUG_CPPFLAGS)
%C%_btree_test_LDADD = \
libzpool.la \
libzfs_core.la
if WANT_DEVNAME2DEVID
pkgexec_PROGRAMS += devname2devid
devname2devid_SOURCES = devname2devid.c
devname2devid_CFLAGS = $(AM_CFLAGS) $(LIBUDEV_CFLAGS)
devname2devid_LDADD = $(LIBUDEV_LIBS)
scripts_zfs_tests_bin_PROGRAMS += %D%/devname2devid
%C%_devname2devid_CFLAGS = $(AM_CFLAGS) $(LIBUDEV_CFLAGS)
%C%_devname2devid_LDADD = $(LIBUDEV_LIBS)
endif
pkgexec_PROGRAMS += dir_rd_update
dir_rd_update_SOURCES = dir_rd_update.c
scripts_zfs_tests_bin_PROGRAMS += %D%/draid
%C%_draid_CFLAGS = $(AM_CFLAGS) $(ZLIB_CFLAGS)
%C%_draid_LDADD = \
libzpool.la \
libnvpair.la
%C%_draid_LDADD += $(ZLIB_LIBS)
pkgexec_PROGRAMS += draid
draid_CFLAGS = $(AM_CFLAGS) $(ZLIB_CFLAGS)
draid_SOURCES = draid.c
draid_LDADD = \
$(abs_top_builddir)/libzpool.la \
$(abs_top_builddir)/libnvpair.la
draid_LDADD += $(ZLIB_LIBS)
EXTRA_DIST += $(addprefix %D%/,file/file_common.h)
scripts_zfs_tests_bin_PROGRAMS += %D%/file_check %D%/file_trunc %D%/file_write %D%/largest_file %D%/randwritecomp
%C%_file_check_SOURCES = %D%/file/file_check.c
%C%_file_trunc_SOURCES = %D%/file/file_trunc.c
%C%_file_write_SOURCES = %D%/file/file_write.c
%C%_largest_file_SOURCES = %D%/file/largest_file.c
%C%_randwritecomp_SOURCES = %D%/file/randwritecomp.c
EXTRA_DIST = file/file_common.h
pkgexec_PROGRAMS += file_check file_trunc file_write largest_file randwritecomp
file_check_SOURCES = file/file_check.c
file_trunc_SOURCES = file/file_trunc.c
file_write_SOURCES = file/file_write.c
largest_file_SOURCES = file/largest_file.c
randwritecomp_SOURCES = file/randwritecomp.c
scripts_zfs_tests_bin_PROGRAMS += %D%/libzfs_input_check
%C%_libzfs_input_check_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/include/os/@ac_system_l@/zfs
%C%_libzfs_input_check_LDADD = \
libzfs_core.la \
libnvpair.la
pkgexec_PROGRAMS += get_diff
get_diff_SOURCES = get_diff.c
scripts_zfs_tests_bin_PROGRAMS += %D%/mkbusy %D%/mkfile %D%/mkfiles %D%/mktree
%C%_mkfile_LDADD = $(LTLIBINTL)
pkgexec_PROGRAMS += libzfs_input_check
libzfs_input_check_SOURCES = libzfs_input_check.c
if BUILD_FREEBSD
libzfs_input_check_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/include/os/freebsd/zfs
endif
if BUILD_LINUX
libzfs_input_check_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/include/os/linux/zfs
endif
libzfs_input_check_LDADD = \
$(abs_top_builddir)/libzfs_core.la \
$(abs_top_builddir)/libnvpair.la
pkgexec_PROGRAMS += mkbusy mkfile mkfiles mktree
mkbusy_SOURCES = mkbusy.c
mkfile_SOURCES = mkfile.c
mkfile_LDADD = $(LTLIBINTL)
mkfiles_SOURCES = mkfiles.c
mktree_SOURCES = mktree.c
pkgexec_PROGRAMS += mmap_exec mmap_seek mmap_sync mmapwrite readmmap
mmap_exec_SOURCES = mmap_exec.c
mmap_seek_SOURCES = mmap_seek.c
mmap_sync_SOURCES = mmap_sync.c
mmapwrite_SOURCES = mmapwrite.c
mmapwrite_LDADD = -lpthread
readmmap_SOURCES = readmmap.c
scripts_zfs_tests_bin_PROGRAMS += %D%/mmap_exec %D%/mmap_seek %D%/mmap_sync %D%/mmapwrite %D%/readmmap
%C%_mmapwrite_LDADD = -lpthread
if WANT_MMAP_LIBAIO
pkgexec_PROGRAMS += mmap_libaio
mmap_libaio_SOURCES = mmap_libaio.c
mmap_libaio_CFLAGS = $(AM_CFLAGS) $(LIBAIO_CFLAGS)
mmap_libaio_LDADD = $(LIBAIO_LIBS)
scripts_zfs_tests_bin_PROGRAMS += %D%/mmap_libaio
%C%_mmap_libaio_CFLAGS = $(AM_CFLAGS) $(LIBAIO_CFLAGS)
%C%_mmap_libaio_LDADD = $(LIBAIO_LIBS)
endif
pkgexec_PROGRAMS += nvlist_to_lua
nvlist_to_lua_SOURCES = nvlist_to_lua.c
nvlist_to_lua_LDADD = \
$(abs_top_builddir)/libzfs_core.la \
$(abs_top_builddir)/libnvpair.la
scripts_zfs_tests_bin_PROGRAMS += %D%/nvlist_to_lua
%C%_nvlist_to_lua_LDADD = \
libzfs_core.la \
libnvpair.la
scripts_zfs_tests_bin_PROGRAMS += %D%/rm_lnkcnt_zero_file
%C%_rm_lnkcnt_zero_file_LDADD = -lpthread
scripts_zfs_tests_bin_PROGRAMS += %D%/send_doall
%C%_send_doall_LDADD = \
libzfs_core.la \
libzfs.la \
libnvpair.la
scripts_zfs_tests_bin_PROGRAMS += %D%/stride_dd
%C%_stride_dd_LDADD = -lrt
scripts_zfs_tests_bin_PROGRAMS += %D%/threadsappend
%C%_threadsappend_LDADD = -lpthread
scripts_zfs_tests_bin_PROGRAMS += %D%/ereports
%C%_ereports_LDADD = \
libnvpair.la \
libzfs.la
pkgexec_PROGRAMS += rename_dir
rename_dir_SOURCES = rename_dir.c
pkgexec_PROGRAMS += rm_lnkcnt_zero_file
rm_lnkcnt_zero_file_SOURCES = rm_lnkcnt_zero_file.c
rm_lnkcnt_zero_file_LDADD = -lpthread
pkgexec_PROGRAMS += send_doall
send_doall_SOURCES = send_doall.c
send_doall_LDADD = \
$(abs_top_builddir)/libzfs_core.la \
$(abs_top_builddir)/libzfs.la \
$(abs_top_builddir)/libnvpair.la
pkgexec_PROGRAMS += stride_dd
stride_dd_SOURCES = stride_dd.c
stride_dd_LDADD = -lrt
pkgexec_PROGRAMS += threadsappend
threadsappend_SOURCES = threadsappend.c
threadsappend_LDADD = -lpthread
pkgexec_PROGRAMS += suid_write_to_file
suid_write_to_file_SOURCES = suid_write_to_file.c
pkgexec_PROGRAMS += cp_files
cp_files_SOURCES = cp_files.c
pkgexec_PROGRAMS += ctime
ctime_SOURCES = ctime.c
pkgexec_PROGRAMS += truncate_test
truncate_test_SOURCES = truncate_test.c
pkgexec_PROGRAMS += ereports
ereports_SOURCES = ereports.c
ereports_LDADD = \
$(abs_top_builddir)/libnvpair.la \
$(abs_top_builddir)/libzfs.la
pkgexec_PROGRAMS += zfs_diff-socket
zfs_diff_socket_SOURCES = zfs_diff-socket.c
pkgexec_PROGRAMS += dosmode_readonly_write
dosmode_readonly_write_SOURCES = dosmode_readonly_write.c
pkgexec_PROGRAMS += edonr_test skein_test sha2_test
skein_test_SOURCES = checksum/skein_test.c
sha2_test_SOURCES = checksum/sha2_test.c
edonr_test_SOURCES = checksum/edonr_test.c
skein_test_LDADD = \
$(abs_top_builddir)/libicp.la \
$(abs_top_builddir)/libspl_assert.la
sha2_test_LDADD = \
$(abs_top_builddir)/libicp.la \
$(abs_top_builddir)/libspl_assert.la
edonr_test_LDADD = \
$(abs_top_builddir)/libicp.la \
$(abs_top_builddir)/libspl_assert.la
scripts_zfs_tests_bin_PROGRAMS += %D%/edonr_test %D%/skein_test %D%/sha2_test
%C%_skein_test_SOURCES = %D%/checksum/skein_test.c
%C%_sha2_test_SOURCES = %D%/checksum/sha2_test.c
%C%_edonr_test_SOURCES = %D%/checksum/edonr_test.c
%C%_skein_test_LDADD = \
libicp.la \
libspl_assert.la
%C%_sha2_test_LDADD = $(%C%_skein_test_LDADD)
%C%_edonr_test_LDADD = $(%C%_skein_test_LDADD)
if BUILD_LINUX
pkgexec_PROGRAMS += getversion
getversion_SOURCES = getversion.c
scripts_zfs_tests_bin_PROGRAMS += %D%/getversion
scripts_zfs_tests_bin_PROGRAMS += %D%/user_ns_exec
scripts_zfs_tests_bin_PROGRAMS += %D%/xattrtest
scripts_zfs_tests_bin_PROGRAMS += %D%/zed_fd_spill-zedlet
EXTRA_DIST += linux_dos_attributes/dos_attributes.h
pkgexec_PROGRAMS += read_dos_attributes write_dos_attributes
read_dos_attributes_SOURCES = linux_dos_attributes/read_dos_attributes.c
write_dos_attributes_SOURCES = linux_dos_attributes/write_dos_attributes.c
pkgexec_PROGRAMS += randfree_file
randfree_file_SOURCES = file/randfree_file.c
EXTRA_DIST += $(addprefix %D%/,linux_dos_attributes/dos_attributes.h)
scripts_zfs_tests_bin_PROGRAMS += %D%/read_dos_attributes %D%/write_dos_attributes
%C%_read_dos_attributes_SOURCES = %D%/linux_dos_attributes/read_dos_attributes.c
%C%_write_dos_attributes_SOURCES = %D%/linux_dos_attributes/write_dos_attributes.c
pkgexec_PROGRAMS += user_ns_exec
user_ns_exec_SOURCES = user_ns_exec.c
pkgexec_PROGRAMS += xattrtest
xattrtest_SOURCES = xattrtest.c
pkgexec_PROGRAMS += zed_fd_spill-zedlet
zed_fd_spill_zedlet_SOURCES = zed_fd_spill-zedlet.c
scripts_zfs_tests_bin_PROGRAMS += %D%/randfree_file
%C%_randfree_file_SOURCES = %D%/file/randfree_file.c
endif

16
tests/zfs-tests/include/Makefile.am
View File

@ -1,16 +0,0 @@
CLEANFILES =
EXTRA_DIST =
include $(top_srcdir)/config/Substfiles.am
pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/include
dist_pkgdata_DATA = \
blkdev.shlib \
commands.cfg \
libtest.shlib \
math.shlib \
properties.shlib \
tunables.cfg \
zpool_script.shlib
nodist_pkgdata_DATA = default.cfg
SUBSTFILES += $(nodist_pkgdata_DATA)

2
tests/zfs-tests/tests/Makefile.am
View File

@ -1 +1 @@
SUBDIRS = functional perf stress
SUBDIRS = functional perf

1
tests/zfs-tests/tests/functional/Makefile.am
View File

@ -29,7 +29,6 @@ SUBDIRS = \
features \
grow \
history \
hkdf \
inheritance \
inuse \
io \

8
tests/zfs-tests/tests/functional/hkdf/Makefile.am
View File

@ -1,8 +0,0 @@
include $(top_srcdir)/config/Rules.am
pkgexecdir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/hkdf
pkgexec_PROGRAMS = hkdf_test
hkdf_test_SOURCES = hkdf_test.c
hkdf_test_LDADD = \
$(abs_top_builddir)/libzpool.la

8
tests/zfs-tests/tests/functional/libzfs/Makefile.am
View File

@ -1,14 +1,6 @@
include $(top_srcdir)/config/Rules.am
pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/libzfs
pkgexecdir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/libzfs
dist_pkgdata_SCRIPTS = \
cleanup.ksh \
setup.ksh \
libzfs_input.ksh
pkgexec_PROGRAMS = many_fds
many_fds_SOURCES = many_fds.c
many_fds_LDADD = \
$(abs_top_builddir)/libzfs.la

11
tests/zfs-tests/tests/functional/tmpfile/Makefile.am
View File

@ -1,16 +1,5 @@
include $(top_srcdir)/config/Rules.am
pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/tmpfile
dist_pkgdata_SCRIPTS = \
cleanup.ksh \
setup.ksh
pkgexecdir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/tmpfile
pkgexec_PROGRAMS = tmpfile_test tmpfile_001_pos tmpfile_002_pos \
tmpfile_003_pos tmpfile_stat_mode
tmpfile_test_SOURCES= tmpfile_test.c
tmpfile_001_pos_SOURCES = tmpfile_001_pos.c
tmpfile_002_pos_SOURCES = tmpfile_002_pos.c
tmpfile_003_pos_SOURCES = tmpfile_003_pos.c

1
tests/zfs-tests/tests/stress/Makefile.am
View File

@ -1 +0,0 @@
SUBDIRS =