c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2026-05-22 02:27:36 +03:00
Code Issues 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
Download Patch File Download Diff File Expand all files Collapse all files
tests/zfs-tests/Makefile.am
+48 -1
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)
tests/zfs-tests/callbacks/Makefile.am
-6
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
tests/zfs-tests/cmd/Makefile.am
+92 -152
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
tests/zfs-tests/include/Makefile.am
-16
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)
tests/zfs-tests/tests/Makefile.am
+1 -1
View File
@@ -1 +1 @@
SUBDIRS = functional perf stress
SUBDIRS = functional perf
tests/zfs-tests/tests/functional/Makefile.am
-1
View File
@@ -29,7 +29,6 @@ SUBDIRS = \
features \
grow \
history \
hkdf \
inheritance \
inuse \
io \
tests/zfs-tests/tests/functional/hkdf/Makefile.am
-8
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
tests/zfs-tests/tests/functional/libzfs/Makefile.am
-8
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
tests/zfs-tests/tests/functional/tmpfile/Makefile.am
-11
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
tests/zfs-tests/tests/stress/Makefile.am
-1
View File
@@ -1 +0,0 @@
SUBDIRS =