From e294acdba879bf86e7253beeaaa5f098b92157d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=BD=D0=B0=D0=B1?= Date: Tue, 22 Mar 2022 20:09:47 +0100 Subject: [PATCH] tests: cmd: don't recurse MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This confers an >10x speedup on t/z-t/cmd builds (12s -> 1.1s), gets rid of 23 redundant identical automake specs and gitignores, and groups the binaries with their common headers Reviewed-by: Brian Behlendorf Reviewed-by: John Kennedy Reviewed-by: Ryan Moeller Signed-off-by: Ahelenia Ziemiańska Closes #13259 --- configure.ac | 33 ---- tests/zfs-tests/cmd/.gitignore | 34 ++++ tests/zfs-tests/cmd/Makefile.am | 177 ++++++++++++++---- tests/zfs-tests/cmd/{badsend => }/badsend.c | 0 tests/zfs-tests/cmd/badsend/.gitignore | 1 - tests/zfs-tests/cmd/badsend/Makefile.am | 11 -- .../cmd/{btree_test => }/btree_test.c | 0 tests/zfs-tests/cmd/btree_test/.gitignore | 1 - tests/zfs-tests/cmd/btree_test/Makefile.am | 32 ---- .../cmd/{chg_usr_exec => }/chg_usr_exec.c | 0 tests/zfs-tests/cmd/chg_usr_exec/.gitignore | 1 - tests/zfs-tests/cmd/chg_usr_exec/Makefile.am | 6 - .../cmd/{devname2devid => }/devname2devid.c | 0 tests/zfs-tests/cmd/devname2devid/.gitignore | 1 - tests/zfs-tests/cmd/devname2devid/Makefile.am | 10 - .../cmd/{dir_rd_update => }/dir_rd_update.c | 0 tests/zfs-tests/cmd/dir_rd_update/.gitignore | 1 - tests/zfs-tests/cmd/dir_rd_update/Makefile.am | 6 - tests/zfs-tests/cmd/{draid => }/draid.c | 0 tests/zfs-tests/cmd/draid/.gitignore | 1 - tests/zfs-tests/cmd/draid/Makefile.am | 15 -- .../cmd/{file_check => file}/file_check.c | 2 +- tests/zfs-tests/cmd/{ => file}/file_common.h | 0 .../cmd/{file_trunc => file}/file_trunc.c | 0 .../cmd/{file_write => file}/file_write.c | 2 +- .../cmd/{largest_file => file}/largest_file.c | 2 +- .../{randfree_file => file}/randfree_file.c | 2 +- .../{randwritecomp => file}/randwritecomp.c | 2 +- tests/zfs-tests/cmd/file_check/.gitignore | 1 - tests/zfs-tests/cmd/file_check/Makefile.am | 6 - tests/zfs-tests/cmd/file_trunc/.gitignore | 1 - tests/zfs-tests/cmd/file_trunc/Makefile.am | 6 - tests/zfs-tests/cmd/file_write/.gitignore | 1 - tests/zfs-tests/cmd/file_write/Makefile.am | 6 - tests/zfs-tests/cmd/{get_diff => }/get_diff.c | 0 tests/zfs-tests/cmd/get_diff/.gitignore | 1 - tests/zfs-tests/cmd/get_diff/Makefile.am | 6 - .../cmd/{getversion => }/getversion.c | 0 tests/zfs-tests/cmd/getversion/.gitignore | 1 - tests/zfs-tests/cmd/getversion/Makefile.am | 6 - tests/zfs-tests/cmd/largest_file/.gitignore | 1 - tests/zfs-tests/cmd/largest_file/Makefile.am | 6 - .../libzfs_input_check.c | 0 .../cmd/libzfs_input_check/.gitignore | 1 - .../cmd/libzfs_input_check/Makefile.am | 17 -- .../cmd/linux_dos_attributes/.gitignore | 2 - .../cmd/linux_dos_attributes/Makefile.am | 8 - tests/zfs-tests/cmd/{mkbusy => }/mkbusy.c | 0 tests/zfs-tests/cmd/mkbusy/.gitignore | 1 - tests/zfs-tests/cmd/mkbusy/Makefile.am | 6 - tests/zfs-tests/cmd/{mkfile => }/mkfile.c | 0 tests/zfs-tests/cmd/mkfile/.gitignore | 1 - tests/zfs-tests/cmd/mkfile/Makefile.am | 8 - tests/zfs-tests/cmd/{mkfiles => }/mkfiles.c | 0 tests/zfs-tests/cmd/mkfiles/.gitignore | 1 - tests/zfs-tests/cmd/mkfiles/Makefile.am | 6 - tests/zfs-tests/cmd/{mktree => }/mktree.c | 0 tests/zfs-tests/cmd/mktree/.gitignore | 1 - tests/zfs-tests/cmd/mktree/Makefile.am | 6 - .../zfs-tests/cmd/{mmap_exec => }/mmap_exec.c | 0 tests/zfs-tests/cmd/mmap_exec/.gitignore | 1 - tests/zfs-tests/cmd/mmap_exec/Makefile.am | 6 - .../cmd/{mmap_libaio => }/mmap_libaio.c | 0 tests/zfs-tests/cmd/mmap_libaio/.gitignore | 1 - tests/zfs-tests/cmd/mmap_libaio/Makefile.am | 10 - .../zfs-tests/cmd/{mmap_seek => }/mmap_seek.c | 0 tests/zfs-tests/cmd/mmap_seek/.gitignore | 1 - tests/zfs-tests/cmd/mmap_seek/Makefile.am | 6 - .../zfs-tests/cmd/{mmapwrite => }/mmapwrite.c | 0 tests/zfs-tests/cmd/mmapwrite/.gitignore | 1 - tests/zfs-tests/cmd/mmapwrite/Makefile.am | 7 - .../cmd/{nvlist_to_lua => }/nvlist_to_lua.c | 0 tests/zfs-tests/cmd/nvlist_to_lua/.gitignore | 1 - tests/zfs-tests/cmd/nvlist_to_lua/Makefile.am | 10 - tests/zfs-tests/cmd/randfree_file/.gitignore | 1 - tests/zfs-tests/cmd/randfree_file/Makefile.am | 6 - tests/zfs-tests/cmd/randwritecomp/.gitignore | 1 - tests/zfs-tests/cmd/randwritecomp/Makefile.am | 9 - tests/zfs-tests/cmd/{readmmap => }/readmmap.c | 0 tests/zfs-tests/cmd/readmmap/.gitignore | 1 - tests/zfs-tests/cmd/readmmap/Makefile.am | 6 - .../cmd/{rename_dir => }/rename_dir.c | 0 tests/zfs-tests/cmd/rename_dir/.gitignore | 1 - tests/zfs-tests/cmd/rename_dir/Makefile.am | 6 - .../rm_lnkcnt_zero_file.c | 0 .../cmd/rm_lnkcnt_zero_file/.gitignore | 1 - .../cmd/rm_lnkcnt_zero_file/Makefile.am | 7 - .../cmd/{send_doall => }/send_doall.c | 0 tests/zfs-tests/cmd/send_doall/.gitignore | 1 - tests/zfs-tests/cmd/send_doall/Makefile.am | 11 -- .../zfs-tests/cmd/{stride_dd => }/stride_dd.c | 0 tests/zfs-tests/cmd/stride_dd/.gitignore | 1 - tests/zfs-tests/cmd/stride_dd/Makefile.am | 7 - .../cmd/{threadsappend => }/threadsappend.c | 0 tests/zfs-tests/cmd/threadsappend/.gitignore | 1 - tests/zfs-tests/cmd/threadsappend/Makefile.am | 7 - .../cmd/{user_ns_exec => }/user_ns_exec.c | 0 tests/zfs-tests/cmd/user_ns_exec/.gitignore | 1 - tests/zfs-tests/cmd/user_ns_exec/Makefile.am | 6 - .../zfs-tests/cmd/{xattrtest => }/xattrtest.c | 0 tests/zfs-tests/cmd/xattrtest/.gitignore | 1 - tests/zfs-tests/cmd/xattrtest/Makefile.am | 6 - 102 files changed, 180 insertions(+), 385 deletions(-) create mode 100644 tests/zfs-tests/cmd/.gitignore rename tests/zfs-tests/cmd/{badsend => }/badsend.c (100%) delete mode 100644 tests/zfs-tests/cmd/badsend/.gitignore delete mode 100644 tests/zfs-tests/cmd/badsend/Makefile.am rename tests/zfs-tests/cmd/{btree_test => }/btree_test.c (100%) delete mode 100644 tests/zfs-tests/cmd/btree_test/.gitignore delete mode 100644 tests/zfs-tests/cmd/btree_test/Makefile.am rename tests/zfs-tests/cmd/{chg_usr_exec => }/chg_usr_exec.c (100%) delete mode 100644 tests/zfs-tests/cmd/chg_usr_exec/.gitignore delete mode 100644 tests/zfs-tests/cmd/chg_usr_exec/Makefile.am rename tests/zfs-tests/cmd/{devname2devid => }/devname2devid.c (100%) delete mode 100644 tests/zfs-tests/cmd/devname2devid/.gitignore delete mode 100644 tests/zfs-tests/cmd/devname2devid/Makefile.am rename tests/zfs-tests/cmd/{dir_rd_update => }/dir_rd_update.c (100%) delete mode 100644 tests/zfs-tests/cmd/dir_rd_update/.gitignore delete mode 100644 tests/zfs-tests/cmd/dir_rd_update/Makefile.am rename tests/zfs-tests/cmd/{draid => }/draid.c (100%) delete mode 100644 tests/zfs-tests/cmd/draid/.gitignore delete mode 100644 tests/zfs-tests/cmd/draid/Makefile.am rename tests/zfs-tests/cmd/{file_check => file}/file_check.c (98%) rename tests/zfs-tests/cmd/{ => file}/file_common.h (100%) rename tests/zfs-tests/cmd/{file_trunc => file}/file_trunc.c (100%) rename tests/zfs-tests/cmd/{file_write => file}/file_write.c (99%) rename tests/zfs-tests/cmd/{largest_file => file}/largest_file.c (99%) rename tests/zfs-tests/cmd/{randfree_file => file}/randfree_file.c (99%) rename tests/zfs-tests/cmd/{randwritecomp => file}/randwritecomp.c (99%) delete mode 100644 tests/zfs-tests/cmd/file_check/.gitignore delete mode 100644 tests/zfs-tests/cmd/file_check/Makefile.am delete mode 100644 tests/zfs-tests/cmd/file_trunc/.gitignore delete mode 100644 tests/zfs-tests/cmd/file_trunc/Makefile.am delete mode 100644 tests/zfs-tests/cmd/file_write/.gitignore delete mode 100644 tests/zfs-tests/cmd/file_write/Makefile.am rename tests/zfs-tests/cmd/{get_diff => }/get_diff.c (100%) delete mode 100644 tests/zfs-tests/cmd/get_diff/.gitignore delete mode 100644 tests/zfs-tests/cmd/get_diff/Makefile.am rename tests/zfs-tests/cmd/{getversion => }/getversion.c (100%) delete mode 100644 tests/zfs-tests/cmd/getversion/.gitignore delete mode 100644 tests/zfs-tests/cmd/getversion/Makefile.am delete mode 100644 tests/zfs-tests/cmd/largest_file/.gitignore delete mode 100644 tests/zfs-tests/cmd/largest_file/Makefile.am rename tests/zfs-tests/cmd/{libzfs_input_check => }/libzfs_input_check.c (100%) delete mode 100644 tests/zfs-tests/cmd/libzfs_input_check/.gitignore delete mode 100644 tests/zfs-tests/cmd/libzfs_input_check/Makefile.am delete mode 100644 tests/zfs-tests/cmd/linux_dos_attributes/.gitignore delete mode 100644 tests/zfs-tests/cmd/linux_dos_attributes/Makefile.am rename tests/zfs-tests/cmd/{mkbusy => }/mkbusy.c (100%) delete mode 100644 tests/zfs-tests/cmd/mkbusy/.gitignore delete mode 100644 tests/zfs-tests/cmd/mkbusy/Makefile.am rename tests/zfs-tests/cmd/{mkfile => }/mkfile.c (100%) delete mode 100644 tests/zfs-tests/cmd/mkfile/.gitignore delete mode 100644 tests/zfs-tests/cmd/mkfile/Makefile.am rename tests/zfs-tests/cmd/{mkfiles => }/mkfiles.c (100%) delete mode 100644 tests/zfs-tests/cmd/mkfiles/.gitignore delete mode 100644 tests/zfs-tests/cmd/mkfiles/Makefile.am rename tests/zfs-tests/cmd/{mktree => }/mktree.c (100%) delete mode 100644 tests/zfs-tests/cmd/mktree/.gitignore delete mode 100644 tests/zfs-tests/cmd/mktree/Makefile.am rename tests/zfs-tests/cmd/{mmap_exec => }/mmap_exec.c (100%) delete mode 100644 tests/zfs-tests/cmd/mmap_exec/.gitignore delete mode 100644 tests/zfs-tests/cmd/mmap_exec/Makefile.am rename tests/zfs-tests/cmd/{mmap_libaio => }/mmap_libaio.c (100%) delete mode 100644 tests/zfs-tests/cmd/mmap_libaio/.gitignore delete mode 100644 tests/zfs-tests/cmd/mmap_libaio/Makefile.am rename tests/zfs-tests/cmd/{mmap_seek => }/mmap_seek.c (100%) delete mode 100644 tests/zfs-tests/cmd/mmap_seek/.gitignore delete mode 100644 tests/zfs-tests/cmd/mmap_seek/Makefile.am rename tests/zfs-tests/cmd/{mmapwrite => }/mmapwrite.c (100%) delete mode 100644 tests/zfs-tests/cmd/mmapwrite/.gitignore delete mode 100644 tests/zfs-tests/cmd/mmapwrite/Makefile.am rename tests/zfs-tests/cmd/{nvlist_to_lua => }/nvlist_to_lua.c (100%) delete mode 100644 tests/zfs-tests/cmd/nvlist_to_lua/.gitignore delete mode 100644 tests/zfs-tests/cmd/nvlist_to_lua/Makefile.am delete mode 100644 tests/zfs-tests/cmd/randfree_file/.gitignore delete mode 100644 tests/zfs-tests/cmd/randfree_file/Makefile.am delete mode 100644 tests/zfs-tests/cmd/randwritecomp/.gitignore delete mode 100644 tests/zfs-tests/cmd/randwritecomp/Makefile.am rename tests/zfs-tests/cmd/{readmmap => }/readmmap.c (100%) delete mode 100644 tests/zfs-tests/cmd/readmmap/.gitignore delete mode 100644 tests/zfs-tests/cmd/readmmap/Makefile.am rename tests/zfs-tests/cmd/{rename_dir => }/rename_dir.c (100%) delete mode 100644 tests/zfs-tests/cmd/rename_dir/.gitignore delete mode 100644 tests/zfs-tests/cmd/rename_dir/Makefile.am rename tests/zfs-tests/cmd/{rm_lnkcnt_zero_file => }/rm_lnkcnt_zero_file.c (100%) delete mode 100644 tests/zfs-tests/cmd/rm_lnkcnt_zero_file/.gitignore delete mode 100644 tests/zfs-tests/cmd/rm_lnkcnt_zero_file/Makefile.am rename tests/zfs-tests/cmd/{send_doall => }/send_doall.c (100%) delete mode 100644 tests/zfs-tests/cmd/send_doall/.gitignore delete mode 100644 tests/zfs-tests/cmd/send_doall/Makefile.am rename tests/zfs-tests/cmd/{stride_dd => }/stride_dd.c (100%) delete mode 100644 tests/zfs-tests/cmd/stride_dd/.gitignore delete mode 100644 tests/zfs-tests/cmd/stride_dd/Makefile.am rename tests/zfs-tests/cmd/{threadsappend => }/threadsappend.c (100%) delete mode 100644 tests/zfs-tests/cmd/threadsappend/.gitignore delete mode 100644 tests/zfs-tests/cmd/threadsappend/Makefile.am rename tests/zfs-tests/cmd/{user_ns_exec => }/user_ns_exec.c (100%) delete mode 100644 tests/zfs-tests/cmd/user_ns_exec/.gitignore delete mode 100644 tests/zfs-tests/cmd/user_ns_exec/Makefile.am rename tests/zfs-tests/cmd/{xattrtest => }/xattrtest.c (100%) delete mode 100644 tests/zfs-tests/cmd/xattrtest/.gitignore delete mode 100644 tests/zfs-tests/cmd/xattrtest/Makefile.am diff --git a/configure.ac b/configure.ac index 04fbb491ad..380b97d624 100644 --- a/configure.ac +++ b/configure.ac @@ -201,39 +201,6 @@ AC_CONFIG_FILES([ tests/zfs-tests/Makefile tests/zfs-tests/callbacks/Makefile tests/zfs-tests/cmd/Makefile - tests/zfs-tests/cmd/badsend/Makefile - tests/zfs-tests/cmd/btree_test/Makefile - tests/zfs-tests/cmd/chg_usr_exec/Makefile - tests/zfs-tests/cmd/devname2devid/Makefile - tests/zfs-tests/cmd/draid/Makefile - tests/zfs-tests/cmd/dir_rd_update/Makefile - tests/zfs-tests/cmd/file_check/Makefile - tests/zfs-tests/cmd/file_trunc/Makefile - tests/zfs-tests/cmd/file_write/Makefile - tests/zfs-tests/cmd/get_diff/Makefile - tests/zfs-tests/cmd/getversion/Makefile - tests/zfs-tests/cmd/largest_file/Makefile - tests/zfs-tests/cmd/libzfs_input_check/Makefile - tests/zfs-tests/cmd/mkbusy/Makefile - tests/zfs-tests/cmd/mkfile/Makefile - tests/zfs-tests/cmd/mkfiles/Makefile - tests/zfs-tests/cmd/mktree/Makefile - tests/zfs-tests/cmd/mmap_exec/Makefile - tests/zfs-tests/cmd/mmap_libaio/Makefile - tests/zfs-tests/cmd/mmap_seek/Makefile - tests/zfs-tests/cmd/mmapwrite/Makefile - tests/zfs-tests/cmd/nvlist_to_lua/Makefile - tests/zfs-tests/cmd/randfree_file/Makefile - tests/zfs-tests/cmd/randwritecomp/Makefile - tests/zfs-tests/cmd/readmmap/Makefile - tests/zfs-tests/cmd/linux_dos_attributes/Makefile - tests/zfs-tests/cmd/rename_dir/Makefile - tests/zfs-tests/cmd/rm_lnkcnt_zero_file/Makefile - tests/zfs-tests/cmd/send_doall/Makefile - tests/zfs-tests/cmd/stride_dd/Makefile - tests/zfs-tests/cmd/threadsappend/Makefile - tests/zfs-tests/cmd/user_ns_exec/Makefile - tests/zfs-tests/cmd/xattrtest/Makefile tests/zfs-tests/include/Makefile tests/zfs-tests/tests/Makefile tests/zfs-tests/tests/functional/Makefile diff --git a/tests/zfs-tests/cmd/.gitignore b/tests/zfs-tests/cmd/.gitignore new file mode 100644 index 0000000000..ea4d2613c5 --- /dev/null +++ b/tests/zfs-tests/cmd/.gitignore @@ -0,0 +1,34 @@ +/badsend +/btree_test +/chg_usr_exec +/devname2devid +/dir_rd_update +/draid +/file_check +/file_trunc +/file_write +/get_diff +/getversion +/largest_file +/libzfs_input_check +/mkbusy +/mkfile +/mkfiles +/mktree +/mmap_exec +/mmap_libaio +/mmap_seek +/mmapwrite +/nvlist_to_lua +/randfree_file +/randwritecomp +/read_dos_attributes +/readmmap +/rename_dir +/rm_lnkcnt_zero_file +/send_doall +/stride_dd +/threadsappend +/user_ns_exec +/write_dos_attributes +/xattrtest diff --git a/tests/zfs-tests/cmd/Makefile.am b/tests/zfs-tests/cmd/Makefile.am index fb49edd3a5..ca3befb277 100644 --- a/tests/zfs-tests/cmd/Makefile.am +++ b/tests/zfs-tests/cmd/Makefile.am @@ -1,40 +1,145 @@ -EXTRA_DIST = file_common.h +include $(top_srcdir)/config/Rules.am + +pkgexecdir = $(datadir)/@PACKAGE@/zfs-tests/bin + + +pkgexec_PROGRAMS = badsend +badsend_SOURCES = badsend.c +badsend_LDADD = \ + $(abs_top_builddir)/lib/libzfs_core/libzfs_core.la \ + $(abs_top_builddir)/lib/libzfs/libzfs.la \ + $(abs_top_builddir)/lib/libnvpair/libnvpair.la + + +pkgexec_PROGRAMS += btree_test +btree_test_SOURCES = btree_test.c +# Unconditionally enable ASSERTs +btree_test_CPPFLAGS = $(AM_CPPFLAGS) -DDEBUG -UNDEBUG -DZFS_DEBUG +btree_test_LDADD = \ + $(abs_top_builddir)/lib/libzpool/libzpool.la \ + $(abs_top_builddir)/lib/libzfs_core/libzfs_core.la + + +pkgexec_PROGRAMS += chg_usr_exec +chg_usr_exec_SOURCES = chg_usr_exec.c + + +if WANT_DEVNAME2DEVID +pkgexec_PROGRAMS += devname2devid +devname2devid_SOURCES = devname2devid.c +devname2devid_CFLAGS = $(AM_CFLAGS) $(LIBUDEV_CFLAGS) +devname2devid_LDADD = $(LIBUDEV_LIBS) +endif + + +pkgexec_PROGRAMS += dir_rd_update +dir_rd_update_SOURCES = dir_rd_update.c + + +pkgexec_PROGRAMS += draid +draid_CFLAGS = $(AM_CFLAGS) $(ZLIB_CFLAGS) +draid_SOURCES = draid.c +draid_LDADD = \ + $(abs_top_builddir)/lib/libzpool/libzpool.la \ + $(abs_top_builddir)/lib/libnvpair/libnvpair.la +draid_LDADD += $(ZLIB_LIBS) + + +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 + + +pkgexec_PROGRAMS += get_diff +get_diff_SOURCES = get_diff.c + + +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)/lib/libzfs_core/libzfs_core.la \ + $(abs_top_builddir)/lib/libnvpair/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 mmapwrite readmmap +mmap_exec_SOURCES = mmap_exec.c +mmap_seek_SOURCES = mmap_seek.c +mmapwrite_SOURCES = mmapwrite.c +mmapwrite_LDADD = -lpthread +readmmap_SOURCES = readmmap.c + +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) +endif + + +pkgexec_PROGRAMS += nvlist_to_lua +nvlist_to_lua_SOURCES = nvlist_to_lua.c +nvlist_to_lua_LDADD = \ + $(abs_top_builddir)/lib/libzfs_core/libzfs_core.la \ + $(abs_top_builddir)/lib/libnvpair/libnvpair.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)/lib/libzfs_core/libzfs_core.la \ + $(abs_top_builddir)/lib/libzfs/libzfs.la \ + $(abs_top_builddir)/lib/libnvpair/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 -SUBDIRS = \ - badsend \ - btree_test \ - chg_usr_exec \ - devname2devid \ - dir_rd_update \ - draid \ - file_check \ - file_trunc \ - file_write \ - get_diff \ - largest_file \ - libzfs_input_check \ - mkbusy \ - mkfile \ - mkfiles \ - mktree \ - mmap_exec \ - mmap_libaio \ - mmap_seek \ - mmapwrite \ - nvlist_to_lua \ - randwritecomp \ - readmmap \ - rename_dir \ - rm_lnkcnt_zero_file \ - send_doall \ - stride_dd \ - threadsappend if BUILD_LINUX -SUBDIRS += \ - getversion \ - randfree_file \ - linux_dos_attributes \ - user_ns_exec \ - xattrtest +pkgexec_PROGRAMS += getversion +getversion_SOURCES = getversion.c + +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 + +pkgexec_PROGRAMS += user_ns_exec +user_ns_exec_SOURCES = user_ns_exec.c + +pkgexec_PROGRAMS += xattrtest +xattrtest_SOURCES = xattrtest.c endif diff --git a/tests/zfs-tests/cmd/badsend/badsend.c b/tests/zfs-tests/cmd/badsend.c similarity index 100% rename from tests/zfs-tests/cmd/badsend/badsend.c rename to tests/zfs-tests/cmd/badsend.c diff --git a/tests/zfs-tests/cmd/badsend/.gitignore b/tests/zfs-tests/cmd/badsend/.gitignore deleted file mode 100644 index d2efa627aa..0000000000 --- a/tests/zfs-tests/cmd/badsend/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/badsend diff --git a/tests/zfs-tests/cmd/badsend/Makefile.am b/tests/zfs-tests/cmd/badsend/Makefile.am deleted file mode 100644 index 5a8946f0d4..0000000000 --- a/tests/zfs-tests/cmd/badsend/Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ -include $(top_srcdir)/config/Rules.am - -pkgexecdir = $(datadir)/@PACKAGE@/zfs-tests/bin - -pkgexec_PROGRAMS = badsend - -badsend_SOURCES = badsend.c -badsend_LDADD = \ - $(abs_top_builddir)/lib/libzfs_core/libzfs_core.la \ - $(abs_top_builddir)/lib/libzfs/libzfs.la \ - $(abs_top_builddir)/lib/libnvpair/libnvpair.la diff --git a/tests/zfs-tests/cmd/btree_test/btree_test.c b/tests/zfs-tests/cmd/btree_test.c similarity index 100% rename from tests/zfs-tests/cmd/btree_test/btree_test.c rename to tests/zfs-tests/cmd/btree_test.c diff --git a/tests/zfs-tests/cmd/btree_test/.gitignore b/tests/zfs-tests/cmd/btree_test/.gitignore deleted file mode 100644 index 73777c4c1f..0000000000 --- a/tests/zfs-tests/cmd/btree_test/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/btree_test diff --git a/tests/zfs-tests/cmd/btree_test/Makefile.am b/tests/zfs-tests/cmd/btree_test/Makefile.am deleted file mode 100644 index 4c9a1a4cc2..0000000000 --- a/tests/zfs-tests/cmd/btree_test/Makefile.am +++ /dev/null @@ -1,32 +0,0 @@ -# -# This file and its contents are supplied under the terms of the -# Common Development and Distribution License ("CDDL"), version 1.0. -# You may only use this file in accordance with the terms of version -# 1.0 of the CDDL. -# -# A full copy of the text of the CDDL should have accompanied this -# source. A copy of the CDDL is also available via the Internet at -# http://www.illumos.org/license/CDDL. -# - -# -# Copyright (c) 2019 by Delphix. All rights reserved. -# - -include $(top_srcdir)/config/Rules.am - -pkgexecdir = $(datadir)/@PACKAGE@/zfs-tests/bin - -DEFAULT_INCLUDES += \ - -I$(top_srcdir)/include \ - -I$(top_srcdir)/lib/libspl/include - -# Unconditionally enable ASSERTs -AM_CPPFLAGS += -DDEBUG -UNDEBUG -DZFS_DEBUG - -pkgexec_PROGRAMS = btree_test -btree_test_SOURCES = btree_test.c - -btree_test_LDADD = \ - $(abs_top_builddir)/lib/libzpool/libzpool.la \ - $(abs_top_builddir)/lib/libzfs_core/libzfs_core.la diff --git a/tests/zfs-tests/cmd/chg_usr_exec/chg_usr_exec.c b/tests/zfs-tests/cmd/chg_usr_exec.c similarity index 100% rename from tests/zfs-tests/cmd/chg_usr_exec/chg_usr_exec.c rename to tests/zfs-tests/cmd/chg_usr_exec.c diff --git a/tests/zfs-tests/cmd/chg_usr_exec/.gitignore b/tests/zfs-tests/cmd/chg_usr_exec/.gitignore deleted file mode 100644 index a8b44df7c5..0000000000 --- a/tests/zfs-tests/cmd/chg_usr_exec/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/chg_usr_exec diff --git a/tests/zfs-tests/cmd/chg_usr_exec/Makefile.am b/tests/zfs-tests/cmd/chg_usr_exec/Makefile.am deleted file mode 100644 index 6f2968f1fa..0000000000 --- a/tests/zfs-tests/cmd/chg_usr_exec/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -include $(top_srcdir)/config/Rules.am - -pkgexecdir = $(datadir)/@PACKAGE@/zfs-tests/bin - -pkgexec_PROGRAMS = chg_usr_exec -chg_usr_exec_SOURCES = chg_usr_exec.c diff --git a/tests/zfs-tests/cmd/devname2devid/devname2devid.c b/tests/zfs-tests/cmd/devname2devid.c similarity index 100% rename from tests/zfs-tests/cmd/devname2devid/devname2devid.c rename to tests/zfs-tests/cmd/devname2devid.c diff --git a/tests/zfs-tests/cmd/devname2devid/.gitignore b/tests/zfs-tests/cmd/devname2devid/.gitignore deleted file mode 100644 index fa9fb6c509..0000000000 --- a/tests/zfs-tests/cmd/devname2devid/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/devname2devid diff --git a/tests/zfs-tests/cmd/devname2devid/Makefile.am b/tests/zfs-tests/cmd/devname2devid/Makefile.am deleted file mode 100644 index b8b630dc2d..0000000000 --- a/tests/zfs-tests/cmd/devname2devid/Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ -include $(top_srcdir)/config/Rules.am - -pkgexecdir = $(datadir)/@PACKAGE@/zfs-tests/bin - -if WANT_DEVNAME2DEVID -pkgexec_PROGRAMS = devname2devid -devname2devid_SOURCES = devname2devid.c -devname2devid_CFLAGS = $(AM_CFLAGS) $(LIBUDEV_CFLAGS) -devname2devid_LDADD = $(LIBUDEV_LIBS) -endif diff --git a/tests/zfs-tests/cmd/dir_rd_update/dir_rd_update.c b/tests/zfs-tests/cmd/dir_rd_update.c similarity index 100% rename from tests/zfs-tests/cmd/dir_rd_update/dir_rd_update.c rename to tests/zfs-tests/cmd/dir_rd_update.c diff --git a/tests/zfs-tests/cmd/dir_rd_update/.gitignore b/tests/zfs-tests/cmd/dir_rd_update/.gitignore deleted file mode 100644 index ec9a15f17a..0000000000 --- a/tests/zfs-tests/cmd/dir_rd_update/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/dir_rd_update diff --git a/tests/zfs-tests/cmd/dir_rd_update/Makefile.am b/tests/zfs-tests/cmd/dir_rd_update/Makefile.am deleted file mode 100644 index 27cc9e97e0..0000000000 --- a/tests/zfs-tests/cmd/dir_rd_update/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -include $(top_srcdir)/config/Rules.am - -pkgexecdir = $(datadir)/@PACKAGE@/zfs-tests/bin - -pkgexec_PROGRAMS = dir_rd_update -dir_rd_update_SOURCES = dir_rd_update.c diff --git a/tests/zfs-tests/cmd/draid/draid.c b/tests/zfs-tests/cmd/draid.c similarity index 100% rename from tests/zfs-tests/cmd/draid/draid.c rename to tests/zfs-tests/cmd/draid.c diff --git a/tests/zfs-tests/cmd/draid/.gitignore b/tests/zfs-tests/cmd/draid/.gitignore deleted file mode 100644 index 911b9f0778..0000000000 --- a/tests/zfs-tests/cmd/draid/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/draid diff --git a/tests/zfs-tests/cmd/draid/Makefile.am b/tests/zfs-tests/cmd/draid/Makefile.am deleted file mode 100644 index 69fed7a6be..0000000000 --- a/tests/zfs-tests/cmd/draid/Makefile.am +++ /dev/null @@ -1,15 +0,0 @@ -include $(top_srcdir)/config/Rules.am - -pkgexecdir = $(datadir)/@PACKAGE@/zfs-tests/bin - -AM_CFLAGS += $(ZLIB_CFLAGS) - -pkgexec_PROGRAMS = draid - -draid_SOURCES = draid.c - -draid_LDADD = \ - $(abs_top_builddir)/lib/libzpool/libzpool.la \ - $(abs_top_builddir)/lib/libnvpair/libnvpair.la - -draid_LDADD += $(ZLIB_LIBS) diff --git a/tests/zfs-tests/cmd/file_check/file_check.c b/tests/zfs-tests/cmd/file/file_check.c similarity index 98% rename from tests/zfs-tests/cmd/file_check/file_check.c rename to tests/zfs-tests/cmd/file/file_check.c index 3d3db753f3..c93b56f45b 100644 --- a/tests/zfs-tests/cmd/file_check/file_check.c +++ b/tests/zfs-tests/cmd/file/file_check.c @@ -24,7 +24,7 @@ * Use is subject to license terms. */ -#include "../file_common.h" +#include "file_common.h" static unsigned char bigbuffer[BIGBUFFERSIZE]; diff --git a/tests/zfs-tests/cmd/file_common.h b/tests/zfs-tests/cmd/file/file_common.h similarity index 100% rename from tests/zfs-tests/cmd/file_common.h rename to tests/zfs-tests/cmd/file/file_common.h diff --git a/tests/zfs-tests/cmd/file_trunc/file_trunc.c b/tests/zfs-tests/cmd/file/file_trunc.c similarity index 100% rename from tests/zfs-tests/cmd/file_trunc/file_trunc.c rename to tests/zfs-tests/cmd/file/file_trunc.c diff --git a/tests/zfs-tests/cmd/file_write/file_write.c b/tests/zfs-tests/cmd/file/file_write.c similarity index 99% rename from tests/zfs-tests/cmd/file_write/file_write.c rename to tests/zfs-tests/cmd/file/file_write.c index 60893c34fb..61101b7b06 100644 --- a/tests/zfs-tests/cmd/file_write/file_write.c +++ b/tests/zfs-tests/cmd/file/file_write.c @@ -24,7 +24,7 @@ * Use is subject to license terms. */ -#include "../file_common.h" +#include "file_common.h" #include #include #include diff --git a/tests/zfs-tests/cmd/largest_file/largest_file.c b/tests/zfs-tests/cmd/file/largest_file.c similarity index 99% rename from tests/zfs-tests/cmd/largest_file/largest_file.c rename to tests/zfs-tests/cmd/file/largest_file.c index 9126076409..5acb5f1db8 100644 --- a/tests/zfs-tests/cmd/largest_file/largest_file.c +++ b/tests/zfs-tests/cmd/file/largest_file.c @@ -28,7 +28,7 @@ * Copyright (c) 2012 by Delphix. All rights reserved. */ -#include "../file_common.h" +#include "file_common.h" #include #include #include diff --git a/tests/zfs-tests/cmd/randfree_file/randfree_file.c b/tests/zfs-tests/cmd/file/randfree_file.c similarity index 99% rename from tests/zfs-tests/cmd/randfree_file/randfree_file.c rename to tests/zfs-tests/cmd/file/randfree_file.c index c708d647e8..e00780cd2e 100644 --- a/tests/zfs-tests/cmd/randfree_file/randfree_file.c +++ b/tests/zfs-tests/cmd/file/randfree_file.c @@ -28,7 +28,7 @@ * Copyright (c) 2012 by Delphix. All rights reserved. */ -#include "../file_common.h" +#include "file_common.h" #include #include #include diff --git a/tests/zfs-tests/cmd/randwritecomp/randwritecomp.c b/tests/zfs-tests/cmd/file/randwritecomp.c similarity index 99% rename from tests/zfs-tests/cmd/randwritecomp/randwritecomp.c rename to tests/zfs-tests/cmd/file/randwritecomp.c index 3cff7fd0a0..cc70d1212f 100644 --- a/tests/zfs-tests/cmd/randwritecomp/randwritecomp.c +++ b/tests/zfs-tests/cmd/file/randwritecomp.c @@ -15,7 +15,7 @@ #include #include -#include "../file_common.h" +#include "file_common.h" /* * The following sample was derived from real-world data diff --git a/tests/zfs-tests/cmd/file_check/.gitignore b/tests/zfs-tests/cmd/file_check/.gitignore deleted file mode 100644 index 24fe113221..0000000000 --- a/tests/zfs-tests/cmd/file_check/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/file_check diff --git a/tests/zfs-tests/cmd/file_check/Makefile.am b/tests/zfs-tests/cmd/file_check/Makefile.am deleted file mode 100644 index 13027ef5bd..0000000000 --- a/tests/zfs-tests/cmd/file_check/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -include $(top_srcdir)/config/Rules.am - -pkgexecdir = $(datadir)/@PACKAGE@/zfs-tests/bin - -pkgexec_PROGRAMS = file_check -file_check_SOURCES = file_check.c diff --git a/tests/zfs-tests/cmd/file_trunc/.gitignore b/tests/zfs-tests/cmd/file_trunc/.gitignore deleted file mode 100644 index 90b149ff51..0000000000 --- a/tests/zfs-tests/cmd/file_trunc/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/file_trunc diff --git a/tests/zfs-tests/cmd/file_trunc/Makefile.am b/tests/zfs-tests/cmd/file_trunc/Makefile.am deleted file mode 100644 index 0455eb4a46..0000000000 --- a/tests/zfs-tests/cmd/file_trunc/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -include $(top_srcdir)/config/Rules.am - -pkgexecdir = $(datadir)/@PACKAGE@/zfs-tests/bin - -pkgexec_PROGRAMS = file_trunc -file_trunc_SOURCES = file_trunc.c diff --git a/tests/zfs-tests/cmd/file_write/.gitignore b/tests/zfs-tests/cmd/file_write/.gitignore deleted file mode 100644 index 9f691d580a..0000000000 --- a/tests/zfs-tests/cmd/file_write/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/file_write diff --git a/tests/zfs-tests/cmd/file_write/Makefile.am b/tests/zfs-tests/cmd/file_write/Makefile.am deleted file mode 100644 index 60895711e7..0000000000 --- a/tests/zfs-tests/cmd/file_write/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -include $(top_srcdir)/config/Rules.am - -pkgexecdir = $(datadir)/@PACKAGE@/zfs-tests/bin - -pkgexec_PROGRAMS = file_write -file_write_SOURCES = file_write.c diff --git a/tests/zfs-tests/cmd/get_diff/get_diff.c b/tests/zfs-tests/cmd/get_diff.c similarity index 100% rename from tests/zfs-tests/cmd/get_diff/get_diff.c rename to tests/zfs-tests/cmd/get_diff.c diff --git a/tests/zfs-tests/cmd/get_diff/.gitignore b/tests/zfs-tests/cmd/get_diff/.gitignore deleted file mode 100644 index f5fc360a68..0000000000 --- a/tests/zfs-tests/cmd/get_diff/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/get_diff diff --git a/tests/zfs-tests/cmd/get_diff/Makefile.am b/tests/zfs-tests/cmd/get_diff/Makefile.am deleted file mode 100644 index 06c39ddd81..0000000000 --- a/tests/zfs-tests/cmd/get_diff/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -include $(top_srcdir)/config/Rules.am - -pkgexecdir = $(datadir)/@PACKAGE@/zfs-tests/bin - -pkgexec_PROGRAMS = get_diff -get_diff_SOURCES = get_diff.c diff --git a/tests/zfs-tests/cmd/getversion/getversion.c b/tests/zfs-tests/cmd/getversion.c similarity index 100% rename from tests/zfs-tests/cmd/getversion/getversion.c rename to tests/zfs-tests/cmd/getversion.c diff --git a/tests/zfs-tests/cmd/getversion/.gitignore b/tests/zfs-tests/cmd/getversion/.gitignore deleted file mode 100644 index b347c417aa..0000000000 --- a/tests/zfs-tests/cmd/getversion/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/getversion diff --git a/tests/zfs-tests/cmd/getversion/Makefile.am b/tests/zfs-tests/cmd/getversion/Makefile.am deleted file mode 100644 index d6b5e84082..0000000000 --- a/tests/zfs-tests/cmd/getversion/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -include $(top_srcdir)/config/Rules.am - -pkgexecdir = $(datadir)/@PACKAGE@/zfs-tests/bin - -pkgexec_PROGRAMS = getversion -getversion_SOURCES = getversion.c diff --git a/tests/zfs-tests/cmd/largest_file/.gitignore b/tests/zfs-tests/cmd/largest_file/.gitignore deleted file mode 100644 index f8f480d065..0000000000 --- a/tests/zfs-tests/cmd/largest_file/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/largest_file diff --git a/tests/zfs-tests/cmd/largest_file/Makefile.am b/tests/zfs-tests/cmd/largest_file/Makefile.am deleted file mode 100644 index a3e4e9337c..0000000000 --- a/tests/zfs-tests/cmd/largest_file/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -include $(top_srcdir)/config/Rules.am - -pkgexecdir = $(datadir)/@PACKAGE@/zfs-tests/bin - -pkgexec_PROGRAMS = largest_file -largest_file_SOURCES = largest_file.c diff --git a/tests/zfs-tests/cmd/libzfs_input_check/libzfs_input_check.c b/tests/zfs-tests/cmd/libzfs_input_check.c similarity index 100% rename from tests/zfs-tests/cmd/libzfs_input_check/libzfs_input_check.c rename to tests/zfs-tests/cmd/libzfs_input_check.c diff --git a/tests/zfs-tests/cmd/libzfs_input_check/.gitignore b/tests/zfs-tests/cmd/libzfs_input_check/.gitignore deleted file mode 100644 index c879600848..0000000000 --- a/tests/zfs-tests/cmd/libzfs_input_check/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/libzfs_input_check diff --git a/tests/zfs-tests/cmd/libzfs_input_check/Makefile.am b/tests/zfs-tests/cmd/libzfs_input_check/Makefile.am deleted file mode 100644 index cd46220895..0000000000 --- a/tests/zfs-tests/cmd/libzfs_input_check/Makefile.am +++ /dev/null @@ -1,17 +0,0 @@ -include $(top_srcdir)/config/Rules.am - -pkgexecdir = $(datadir)/@PACKAGE@/zfs-tests/bin - -pkgexec_PROGRAMS = libzfs_input_check - -if BUILD_FREEBSD -DEFAULT_INCLUDES += -I$(top_srcdir)/include/os/freebsd/zfs -endif -if BUILD_LINUX -DEFAULT_INCLUDES += -I$(top_srcdir)/include/os/linux/zfs -endif - -libzfs_input_check_SOURCES = libzfs_input_check.c -libzfs_input_check_LDADD = \ - $(abs_top_builddir)/lib/libzfs_core/libzfs_core.la \ - $(abs_top_builddir)/lib/libnvpair/libnvpair.la diff --git a/tests/zfs-tests/cmd/linux_dos_attributes/.gitignore b/tests/zfs-tests/cmd/linux_dos_attributes/.gitignore deleted file mode 100644 index 14a62551da..0000000000 --- a/tests/zfs-tests/cmd/linux_dos_attributes/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/read_dos_attributes -/write_dos_attributes diff --git a/tests/zfs-tests/cmd/linux_dos_attributes/Makefile.am b/tests/zfs-tests/cmd/linux_dos_attributes/Makefile.am deleted file mode 100644 index 2e383e94f2..0000000000 --- a/tests/zfs-tests/cmd/linux_dos_attributes/Makefile.am +++ /dev/null @@ -1,8 +0,0 @@ -include $(top_srcdir)/config/Rules.am - -pkgexecdir = $(datadir)/@PACKAGE@/zfs-tests/bin - -EXTRA_DIST = dos_attributes.h -pkgexec_PROGRAMS = read_dos_attributes write_dos_attributes -read_dos_attributes_SOURCES = read_dos_attributes.c -write_dos_attributes_SOURCES = write_dos_attributes.c diff --git a/tests/zfs-tests/cmd/mkbusy/mkbusy.c b/tests/zfs-tests/cmd/mkbusy.c similarity index 100% rename from tests/zfs-tests/cmd/mkbusy/mkbusy.c rename to tests/zfs-tests/cmd/mkbusy.c diff --git a/tests/zfs-tests/cmd/mkbusy/.gitignore b/tests/zfs-tests/cmd/mkbusy/.gitignore deleted file mode 100644 index 18d099c08e..0000000000 --- a/tests/zfs-tests/cmd/mkbusy/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/mkbusy diff --git a/tests/zfs-tests/cmd/mkbusy/Makefile.am b/tests/zfs-tests/cmd/mkbusy/Makefile.am deleted file mode 100644 index abae69dea8..0000000000 --- a/tests/zfs-tests/cmd/mkbusy/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -include $(top_srcdir)/config/Rules.am - -pkgexecdir = $(datadir)/@PACKAGE@/zfs-tests/bin - -pkgexec_PROGRAMS = mkbusy -mkbusy_SOURCES = mkbusy.c diff --git a/tests/zfs-tests/cmd/mkfile/mkfile.c b/tests/zfs-tests/cmd/mkfile.c similarity index 100% rename from tests/zfs-tests/cmd/mkfile/mkfile.c rename to tests/zfs-tests/cmd/mkfile.c diff --git a/tests/zfs-tests/cmd/mkfile/.gitignore b/tests/zfs-tests/cmd/mkfile/.gitignore deleted file mode 100644 index 93e9a8a6de..0000000000 --- a/tests/zfs-tests/cmd/mkfile/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/mkfile diff --git a/tests/zfs-tests/cmd/mkfile/Makefile.am b/tests/zfs-tests/cmd/mkfile/Makefile.am deleted file mode 100644 index 5f0e2e03ef..0000000000 --- a/tests/zfs-tests/cmd/mkfile/Makefile.am +++ /dev/null @@ -1,8 +0,0 @@ -include $(top_srcdir)/config/Rules.am - -pkgexecdir = $(datadir)/@PACKAGE@/zfs-tests/bin - -pkgexec_PROGRAMS = mkfile -mkfile_SOURCES = mkfile.c - -mkfile_LDADD = $(LTLIBINTL) diff --git a/tests/zfs-tests/cmd/mkfiles/mkfiles.c b/tests/zfs-tests/cmd/mkfiles.c similarity index 100% rename from tests/zfs-tests/cmd/mkfiles/mkfiles.c rename to tests/zfs-tests/cmd/mkfiles.c diff --git a/tests/zfs-tests/cmd/mkfiles/.gitignore b/tests/zfs-tests/cmd/mkfiles/.gitignore deleted file mode 100644 index cee4858b70..0000000000 --- a/tests/zfs-tests/cmd/mkfiles/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/mkfiles diff --git a/tests/zfs-tests/cmd/mkfiles/Makefile.am b/tests/zfs-tests/cmd/mkfiles/Makefile.am deleted file mode 100644 index 54c21597f3..0000000000 --- a/tests/zfs-tests/cmd/mkfiles/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -include $(top_srcdir)/config/Rules.am - -pkgexecdir = $(datadir)/@PACKAGE@/zfs-tests/bin - -pkgexec_PROGRAMS = mkfiles -mkfiles_SOURCES = mkfiles.c diff --git a/tests/zfs-tests/cmd/mktree/mktree.c b/tests/zfs-tests/cmd/mktree.c similarity index 100% rename from tests/zfs-tests/cmd/mktree/mktree.c rename to tests/zfs-tests/cmd/mktree.c diff --git a/tests/zfs-tests/cmd/mktree/.gitignore b/tests/zfs-tests/cmd/mktree/.gitignore deleted file mode 100644 index 588bc6d1cc..0000000000 --- a/tests/zfs-tests/cmd/mktree/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/mktree diff --git a/tests/zfs-tests/cmd/mktree/Makefile.am b/tests/zfs-tests/cmd/mktree/Makefile.am deleted file mode 100644 index 88c74ae0a3..0000000000 --- a/tests/zfs-tests/cmd/mktree/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -include $(top_srcdir)/config/Rules.am - -pkgexecdir = $(datadir)/@PACKAGE@/zfs-tests/bin - -pkgexec_PROGRAMS = mktree -mktree_SOURCES = mktree.c diff --git a/tests/zfs-tests/cmd/mmap_exec/mmap_exec.c b/tests/zfs-tests/cmd/mmap_exec.c similarity index 100% rename from tests/zfs-tests/cmd/mmap_exec/mmap_exec.c rename to tests/zfs-tests/cmd/mmap_exec.c diff --git a/tests/zfs-tests/cmd/mmap_exec/.gitignore b/tests/zfs-tests/cmd/mmap_exec/.gitignore deleted file mode 100644 index 63a68bbc68..0000000000 --- a/tests/zfs-tests/cmd/mmap_exec/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/mmap_exec diff --git a/tests/zfs-tests/cmd/mmap_exec/Makefile.am b/tests/zfs-tests/cmd/mmap_exec/Makefile.am deleted file mode 100644 index ab9f81be94..0000000000 --- a/tests/zfs-tests/cmd/mmap_exec/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -include $(top_srcdir)/config/Rules.am - -pkgexecdir = $(datadir)/@PACKAGE@/zfs-tests/bin - -pkgexec_PROGRAMS = mmap_exec -mmap_exec_SOURCES = mmap_exec.c diff --git a/tests/zfs-tests/cmd/mmap_libaio/mmap_libaio.c b/tests/zfs-tests/cmd/mmap_libaio.c similarity index 100% rename from tests/zfs-tests/cmd/mmap_libaio/mmap_libaio.c rename to tests/zfs-tests/cmd/mmap_libaio.c diff --git a/tests/zfs-tests/cmd/mmap_libaio/.gitignore b/tests/zfs-tests/cmd/mmap_libaio/.gitignore deleted file mode 100644 index 792c8d3400..0000000000 --- a/tests/zfs-tests/cmd/mmap_libaio/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/mmap_libaio diff --git a/tests/zfs-tests/cmd/mmap_libaio/Makefile.am b/tests/zfs-tests/cmd/mmap_libaio/Makefile.am deleted file mode 100644 index 25f9dda2b6..0000000000 --- a/tests/zfs-tests/cmd/mmap_libaio/Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ -include $(top_srcdir)/config/Rules.am - -pkgexecdir = $(datadir)/@PACKAGE@/zfs-tests/bin - -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) -endif diff --git a/tests/zfs-tests/cmd/mmap_seek/mmap_seek.c b/tests/zfs-tests/cmd/mmap_seek.c similarity index 100% rename from tests/zfs-tests/cmd/mmap_seek/mmap_seek.c rename to tests/zfs-tests/cmd/mmap_seek.c diff --git a/tests/zfs-tests/cmd/mmap_seek/.gitignore b/tests/zfs-tests/cmd/mmap_seek/.gitignore deleted file mode 100644 index 6b05a79175..0000000000 --- a/tests/zfs-tests/cmd/mmap_seek/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/mmap_seek diff --git a/tests/zfs-tests/cmd/mmap_seek/Makefile.am b/tests/zfs-tests/cmd/mmap_seek/Makefile.am deleted file mode 100644 index b938931125..0000000000 --- a/tests/zfs-tests/cmd/mmap_seek/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -include $(top_srcdir)/config/Rules.am - -pkgexecdir = $(datadir)/@PACKAGE@/zfs-tests/bin - -pkgexec_PROGRAMS = mmap_seek -mmap_seek_SOURCES = mmap_seek.c diff --git a/tests/zfs-tests/cmd/mmapwrite/mmapwrite.c b/tests/zfs-tests/cmd/mmapwrite.c similarity index 100% rename from tests/zfs-tests/cmd/mmapwrite/mmapwrite.c rename to tests/zfs-tests/cmd/mmapwrite.c diff --git a/tests/zfs-tests/cmd/mmapwrite/.gitignore b/tests/zfs-tests/cmd/mmapwrite/.gitignore deleted file mode 100644 index 4e7043bbfd..0000000000 --- a/tests/zfs-tests/cmd/mmapwrite/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/mmapwrite diff --git a/tests/zfs-tests/cmd/mmapwrite/Makefile.am b/tests/zfs-tests/cmd/mmapwrite/Makefile.am deleted file mode 100644 index b21b9e779b..0000000000 --- a/tests/zfs-tests/cmd/mmapwrite/Makefile.am +++ /dev/null @@ -1,7 +0,0 @@ -include $(top_srcdir)/config/Rules.am - -pkgexecdir = $(datadir)/@PACKAGE@/zfs-tests/bin - -pkgexec_PROGRAMS = mmapwrite -mmapwrite_SOURCES = mmapwrite.c -mmapwrite_LDADD = -lpthread diff --git a/tests/zfs-tests/cmd/nvlist_to_lua/nvlist_to_lua.c b/tests/zfs-tests/cmd/nvlist_to_lua.c similarity index 100% rename from tests/zfs-tests/cmd/nvlist_to_lua/nvlist_to_lua.c rename to tests/zfs-tests/cmd/nvlist_to_lua.c diff --git a/tests/zfs-tests/cmd/nvlist_to_lua/.gitignore b/tests/zfs-tests/cmd/nvlist_to_lua/.gitignore deleted file mode 100644 index b31db6454d..0000000000 --- a/tests/zfs-tests/cmd/nvlist_to_lua/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/nvlist_to_lua diff --git a/tests/zfs-tests/cmd/nvlist_to_lua/Makefile.am b/tests/zfs-tests/cmd/nvlist_to_lua/Makefile.am deleted file mode 100644 index 511b6c6913..0000000000 --- a/tests/zfs-tests/cmd/nvlist_to_lua/Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ -include $(top_srcdir)/config/Rules.am - -pkgexecdir = $(datadir)/@PACKAGE@/zfs-tests/bin - -pkgexec_PROGRAMS = nvlist_to_lua - -nvlist_to_lua_SOURCES = nvlist_to_lua.c -nvlist_to_lua_LDADD = \ - $(abs_top_builddir)/lib/libzfs_core/libzfs_core.la \ - $(abs_top_builddir)/lib/libnvpair/libnvpair.la diff --git a/tests/zfs-tests/cmd/randfree_file/.gitignore b/tests/zfs-tests/cmd/randfree_file/.gitignore deleted file mode 100644 index 0f5b394c5f..0000000000 --- a/tests/zfs-tests/cmd/randfree_file/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/randfree_file diff --git a/tests/zfs-tests/cmd/randfree_file/Makefile.am b/tests/zfs-tests/cmd/randfree_file/Makefile.am deleted file mode 100644 index 6306e0e757..0000000000 --- a/tests/zfs-tests/cmd/randfree_file/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -include $(top_srcdir)/config/Rules.am - -pkgexecdir = $(datadir)/@PACKAGE@/zfs-tests/bin - -pkgexec_PROGRAMS = randfree_file -randfree_file_SOURCES = randfree_file.c diff --git a/tests/zfs-tests/cmd/randwritecomp/.gitignore b/tests/zfs-tests/cmd/randwritecomp/.gitignore deleted file mode 100644 index fb231c678c..0000000000 --- a/tests/zfs-tests/cmd/randwritecomp/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/randwritecomp diff --git a/tests/zfs-tests/cmd/randwritecomp/Makefile.am b/tests/zfs-tests/cmd/randwritecomp/Makefile.am deleted file mode 100644 index 0002291fa7..0000000000 --- a/tests/zfs-tests/cmd/randwritecomp/Makefile.am +++ /dev/null @@ -1,9 +0,0 @@ -include $(top_srcdir)/config/Rules.am - -pkgexecdir = $(datadir)/@PACKAGE@/zfs-tests/bin - -DEFAULT_INCLUDES += \ - -I$(top_srcdir)/include - -pkgexec_PROGRAMS = randwritecomp -randwritecomp_SOURCES = randwritecomp.c diff --git a/tests/zfs-tests/cmd/readmmap/readmmap.c b/tests/zfs-tests/cmd/readmmap.c similarity index 100% rename from tests/zfs-tests/cmd/readmmap/readmmap.c rename to tests/zfs-tests/cmd/readmmap.c diff --git a/tests/zfs-tests/cmd/readmmap/.gitignore b/tests/zfs-tests/cmd/readmmap/.gitignore deleted file mode 100644 index 3799193a92..0000000000 --- a/tests/zfs-tests/cmd/readmmap/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/readmmap diff --git a/tests/zfs-tests/cmd/readmmap/Makefile.am b/tests/zfs-tests/cmd/readmmap/Makefile.am deleted file mode 100644 index 9b735c287e..0000000000 --- a/tests/zfs-tests/cmd/readmmap/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -include $(top_srcdir)/config/Rules.am - -pkgexecdir = $(datadir)/@PACKAGE@/zfs-tests/bin - -pkgexec_PROGRAMS = readmmap -readmmap_SOURCES = readmmap.c diff --git a/tests/zfs-tests/cmd/rename_dir/rename_dir.c b/tests/zfs-tests/cmd/rename_dir.c similarity index 100% rename from tests/zfs-tests/cmd/rename_dir/rename_dir.c rename to tests/zfs-tests/cmd/rename_dir.c diff --git a/tests/zfs-tests/cmd/rename_dir/.gitignore b/tests/zfs-tests/cmd/rename_dir/.gitignore deleted file mode 100644 index 39a0cb222a..0000000000 --- a/tests/zfs-tests/cmd/rename_dir/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/rename_dir diff --git a/tests/zfs-tests/cmd/rename_dir/Makefile.am b/tests/zfs-tests/cmd/rename_dir/Makefile.am deleted file mode 100644 index 21971cd888..0000000000 --- a/tests/zfs-tests/cmd/rename_dir/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -include $(top_srcdir)/config/Rules.am - -pkgexecdir = $(datadir)/@PACKAGE@/zfs-tests/bin - -pkgexec_PROGRAMS = rename_dir -rename_dir_SOURCES = rename_dir.c diff --git a/tests/zfs-tests/cmd/rm_lnkcnt_zero_file/rm_lnkcnt_zero_file.c b/tests/zfs-tests/cmd/rm_lnkcnt_zero_file.c similarity index 100% rename from tests/zfs-tests/cmd/rm_lnkcnt_zero_file/rm_lnkcnt_zero_file.c rename to tests/zfs-tests/cmd/rm_lnkcnt_zero_file.c diff --git a/tests/zfs-tests/cmd/rm_lnkcnt_zero_file/.gitignore b/tests/zfs-tests/cmd/rm_lnkcnt_zero_file/.gitignore deleted file mode 100644 index fc6323fb3f..0000000000 --- a/tests/zfs-tests/cmd/rm_lnkcnt_zero_file/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/rm_lnkcnt_zero_file diff --git a/tests/zfs-tests/cmd/rm_lnkcnt_zero_file/Makefile.am b/tests/zfs-tests/cmd/rm_lnkcnt_zero_file/Makefile.am deleted file mode 100644 index 90fc8d0541..0000000000 --- a/tests/zfs-tests/cmd/rm_lnkcnt_zero_file/Makefile.am +++ /dev/null @@ -1,7 +0,0 @@ -include $(top_srcdir)/config/Rules.am - -pkgexecdir = $(datadir)/@PACKAGE@/zfs-tests/bin - -pkgexec_PROGRAMS = rm_lnkcnt_zero_file -rm_lnkcnt_zero_file_SOURCES = rm_lnkcnt_zero_file.c -rm_lnkcnt_zero_file_LDADD = -lpthread diff --git a/tests/zfs-tests/cmd/send_doall/send_doall.c b/tests/zfs-tests/cmd/send_doall.c similarity index 100% rename from tests/zfs-tests/cmd/send_doall/send_doall.c rename to tests/zfs-tests/cmd/send_doall.c diff --git a/tests/zfs-tests/cmd/send_doall/.gitignore b/tests/zfs-tests/cmd/send_doall/.gitignore deleted file mode 100644 index 6ba2e603f7..0000000000 --- a/tests/zfs-tests/cmd/send_doall/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/send_doall diff --git a/tests/zfs-tests/cmd/send_doall/Makefile.am b/tests/zfs-tests/cmd/send_doall/Makefile.am deleted file mode 100644 index 33a6b83122..0000000000 --- a/tests/zfs-tests/cmd/send_doall/Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ -include $(top_srcdir)/config/Rules.am - -pkgexecdir = $(datadir)/@PACKAGE@/zfs-tests/bin - -pkgexec_PROGRAMS = send_doall - -send_doall_SOURCES = send_doall.c -send_doall_LDADD = \ - $(abs_top_builddir)/lib/libzfs_core/libzfs_core.la \ - $(abs_top_builddir)/lib/libzfs/libzfs.la \ - $(abs_top_builddir)/lib/libnvpair/libnvpair.la diff --git a/tests/zfs-tests/cmd/stride_dd/stride_dd.c b/tests/zfs-tests/cmd/stride_dd.c similarity index 100% rename from tests/zfs-tests/cmd/stride_dd/stride_dd.c rename to tests/zfs-tests/cmd/stride_dd.c diff --git a/tests/zfs-tests/cmd/stride_dd/.gitignore b/tests/zfs-tests/cmd/stride_dd/.gitignore deleted file mode 100644 index 7c072ee0de..0000000000 --- a/tests/zfs-tests/cmd/stride_dd/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/stride_dd diff --git a/tests/zfs-tests/cmd/stride_dd/Makefile.am b/tests/zfs-tests/cmd/stride_dd/Makefile.am deleted file mode 100644 index d6f1adbac2..0000000000 --- a/tests/zfs-tests/cmd/stride_dd/Makefile.am +++ /dev/null @@ -1,7 +0,0 @@ -include $(top_srcdir)/config/Rules.am - -pkgexecdir = $(datadir)/@PACKAGE@/zfs-tests/bin - -pkgexec_PROGRAMS = stride_dd -stride_dd_SOURCES = stride_dd.c -stride_dd_LDADD = -lrt diff --git a/tests/zfs-tests/cmd/threadsappend/threadsappend.c b/tests/zfs-tests/cmd/threadsappend.c similarity index 100% rename from tests/zfs-tests/cmd/threadsappend/threadsappend.c rename to tests/zfs-tests/cmd/threadsappend.c diff --git a/tests/zfs-tests/cmd/threadsappend/.gitignore b/tests/zfs-tests/cmd/threadsappend/.gitignore deleted file mode 100644 index 4c8c8cdf34..0000000000 --- a/tests/zfs-tests/cmd/threadsappend/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/threadsappend diff --git a/tests/zfs-tests/cmd/threadsappend/Makefile.am b/tests/zfs-tests/cmd/threadsappend/Makefile.am deleted file mode 100644 index f030b42d50..0000000000 --- a/tests/zfs-tests/cmd/threadsappend/Makefile.am +++ /dev/null @@ -1,7 +0,0 @@ -include $(top_srcdir)/config/Rules.am - -pkgexecdir = $(datadir)/@PACKAGE@/zfs-tests/bin - -pkgexec_PROGRAMS = threadsappend -threadsappend_SOURCES = threadsappend.c -threadsappend_LDADD = -lpthread diff --git a/tests/zfs-tests/cmd/user_ns_exec/user_ns_exec.c b/tests/zfs-tests/cmd/user_ns_exec.c similarity index 100% rename from tests/zfs-tests/cmd/user_ns_exec/user_ns_exec.c rename to tests/zfs-tests/cmd/user_ns_exec.c diff --git a/tests/zfs-tests/cmd/user_ns_exec/.gitignore b/tests/zfs-tests/cmd/user_ns_exec/.gitignore deleted file mode 100644 index 655867a640..0000000000 --- a/tests/zfs-tests/cmd/user_ns_exec/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/user_ns_exec diff --git a/tests/zfs-tests/cmd/user_ns_exec/Makefile.am b/tests/zfs-tests/cmd/user_ns_exec/Makefile.am deleted file mode 100644 index 5b4bc9aaa6..0000000000 --- a/tests/zfs-tests/cmd/user_ns_exec/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -include $(top_srcdir)/config/Rules.am - -pkgexecdir = $(datadir)/@PACKAGE@/zfs-tests/bin - -pkgexec_PROGRAMS = user_ns_exec -user_ns_exec_SOURCES = user_ns_exec.c diff --git a/tests/zfs-tests/cmd/xattrtest/xattrtest.c b/tests/zfs-tests/cmd/xattrtest.c similarity index 100% rename from tests/zfs-tests/cmd/xattrtest/xattrtest.c rename to tests/zfs-tests/cmd/xattrtest.c diff --git a/tests/zfs-tests/cmd/xattrtest/.gitignore b/tests/zfs-tests/cmd/xattrtest/.gitignore deleted file mode 100644 index 7d21283836..0000000000 --- a/tests/zfs-tests/cmd/xattrtest/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/xattrtest diff --git a/tests/zfs-tests/cmd/xattrtest/Makefile.am b/tests/zfs-tests/cmd/xattrtest/Makefile.am deleted file mode 100644 index 7398ae6346..0000000000 --- a/tests/zfs-tests/cmd/xattrtest/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -include $(top_srcdir)/config/Rules.am - -pkgexecdir = $(datadir)/@PACKAGE@/zfs-tests/bin - -pkgexec_PROGRAMS = xattrtest -xattrtest_SOURCES = xattrtest.c