fstests: remove DMAPI support from build system

Since we've axed all the DMAPI tests, get rid of the build system
support too.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Acked-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Eryu Guan <guaneryu@gmail.com>
This commit is contained in:
Darrick J. Wong
2021-03-08 20:39:55 -08:00
committed by Eryu Guan
parent 6497ede7ad
commit 49a59dbfed
8 changed files with 4 additions and 35 deletions
+1 -1
View File
@@ -43,7 +43,7 @@ TOOL_SUBDIRS = ltp src m4 common
export TESTS_DIR = tests export TESTS_DIR = tests
SUBDIRS = $(LIB_SUBDIRS) $(TOOL_SUBDIRS) $(TESTS_DIR) SUBDIRS = $(LIB_SUBDIRS) $(TOOL_SUBDIRS) $(TESTS_DIR)
default: include/builddefs $(DMAPI_MAKEFILE) default: include/builddefs
ifeq ($(HAVE_BUILDDEFS), no) ifeq ($(HAVE_BUILDDEFS), no)
$(Q)$(MAKE) $(MAKEOPTS) $@ $(Q)$(MAKE) $(MAKEOPTS) $@
else else
+1 -1
View File
@@ -17,7 +17,7 @@ Group: System Environment/Base
%description %description
The XFS regression test suite. Also includes some support for The XFS regression test suite. Also includes some support for
acl, attr, dmapi, udf, and nfs testing. Contains around 200 specific tests acl, attr, udf, and nfs testing. Contains around 200 specific tests
for userspace & kernelspace. for userspace & kernelspace.
%prep %prep
-1
View File
@@ -277,7 +277,6 @@ _mount_ops_filter()
local params="$*" local params="$*"
local last_index=$(( $# - 1 )) local last_index=$(( $# - 1 ))
#get mount point to handle dmapi mtpt option correctly
[ $last_index -gt 0 ] && shift $last_index [ $last_index -gt 0 ] && shift $last_index
local fs_escaped=$1 local fs_escaped=$1
-1
View File
@@ -58,7 +58,6 @@ AC_PACKAGE_NEED_ACLINIT_LIBACL
AC_PACKAGE_WANT_GDBM AC_PACKAGE_WANT_GDBM
AC_PACKAGE_WANT_AIO AC_PACKAGE_WANT_AIO
AC_PACKAGE_WANT_URING AC_PACKAGE_WANT_URING
AC_PACKAGE_WANT_DMAPI
AC_PACKAGE_WANT_LINUX_FIEMAP_H AC_PACKAGE_WANT_LINUX_FIEMAP_H
AC_PACKAGE_WANT_FALLOCATE AC_PACKAGE_WANT_FALLOCATE
AC_PACKAGE_WANT_OPEN_BY_HANDLE_AT AC_PACKAGE_WANT_OPEN_BY_HANDLE_AT
-1
View File
@@ -63,7 +63,6 @@ HAVE_AIO = @have_aio@
HAVE_URING = @have_uring@ HAVE_URING = @have_uring@
HAVE_FALLOCATE = @have_fallocate@ HAVE_FALLOCATE = @have_fallocate@
HAVE_OPEN_BY_HANDLE_AT = @have_open_by_handle_at@ HAVE_OPEN_BY_HANDLE_AT = @have_open_by_handle_at@
HAVE_DMAPI = @have_dmapi@
HAVE_FIEMAP = @have_fiemap@ HAVE_FIEMAP = @have_fiemap@
HAVE_FALLOCATE = @have_fallocate@ HAVE_FALLOCATE = @have_fallocate@
HAVE_COPY_FILE_RANGE = @have_copy_file_range@ HAVE_COPY_FILE_RANGE = @have_copy_file_range@
-1
View File
@@ -10,7 +10,6 @@ LSRCFILES = \
package_acldev.m4 \ package_acldev.m4 \
package_aiodev.m4 \ package_aiodev.m4 \
package_gdbmdev.m4 \ package_gdbmdev.m4 \
package_dmapidev.m4 \
package_globals.m4 \ package_globals.m4 \
package_libcdev.m4 \ package_libcdev.m4 \
package_liburing.m4 \ package_liburing.m4 \
-27
View File
@@ -1,27 +0,0 @@
AC_DEFUN([AC_PACKAGE_NEED_XFS_DMAPI_H],
[ AC_CHECK_HEADERS([xfs/dmapi.h])
if test "$ac_cv_header_xfs_dmapi_h" != yes; then
echo
echo 'FATAL ERROR: could not find a valid DMAPI library header.'
echo 'Install the data migration API (dmapi) development package.'
echo 'Alternatively, run "make install-dev" from the dmapi source.'
exit 1
fi
])
AC_DEFUN([AC_PACKAGE_WANT_DMAPI],
[ AC_CHECK_LIB(dm, dm_make_handle, [ have_dmapi=true ], [
have_dmapi=false
echo
echo 'WARNING: could not find a valid DMAPI base library.'
echo 'If you want DMAPI support please install the data migration'
echo 'API (dmapi) library package. Alternatively, run "make install"'
echo 'from the dmapi source.'
echo
])
libdm="-ldm"
test -f ${libexecdir}${libdirsuffix}/libdm.la && \
libdm="${libexecdir}${libdirsuffix}/libdm.la"
AC_SUBST(libdm)
AC_SUBST(have_dmapi)
])
+2 -2
View File
@@ -308,7 +308,7 @@ do
*cleantools) *cleantools)
# we need to configure or else we might fail to clean # we need to configure or else we might fail to clean
for pkg in attr acl xfsprogs dmapi xfsdump xfstests for pkg in attr acl xfsprogs xfsdump xfstests
do do
[ -d $WORKAREA/$pkg ] || continue [ -d $WORKAREA/$pkg ] || continue
cd $WORKAREA/$pkg cd $WORKAREA/$pkg
@@ -321,7 +321,7 @@ do
*buildtools) *buildtools)
_log " *** build and install tools" _log " *** build and install tools"
for pkg in attr acl xfsprogs dmapi xfsdump xfstests for pkg in attr acl xfsprogs xfsdump xfstests
do do
[ -d $WORKAREA/$pkg ] || continue [ -d $WORKAREA/$pkg ] || continue
cd $WORKAREA/$pkg cd $WORKAREA/$pkg