mirror of
https://github.com/linux-apfs/apfstests.git
synced 2026-05-01 15:01:44 -07:00
libxfs.h is really only needed for the loggen test;
make it config-time optional. Signed-off-by: Eric Sandeen <sandeen@sandeen.net> Reviewed-by: Christoph Hellwig <hch@infradead.org>
This commit is contained in:
@@ -126,6 +126,8 @@ _filter_mkfs <$tmp.mkfs0 2>$tmp.mkfs1
|
|||||||
[ $lversion -ne 1 ] && \
|
[ $lversion -ne 1 ] && \
|
||||||
_notrun "Cannot run this test yet using MKFS_OPTIONS specified"
|
_notrun "Cannot run this test yet using MKFS_OPTIONS specified"
|
||||||
|
|
||||||
|
[ $here/src/loggen ] || _notrun "loggen not built, skipping test"
|
||||||
|
|
||||||
_check_mount
|
_check_mount
|
||||||
_check_require_logdev
|
_check_require_logdev
|
||||||
|
|
||||||
|
|||||||
Vendored
+3
-9
@@ -416,15 +416,9 @@ AC_DEFUN([AC_PACKAGE_NEED_XFS_XFS_H],
|
|||||||
fi
|
fi
|
||||||
])
|
])
|
||||||
|
|
||||||
AC_DEFUN([AC_PACKAGE_NEED_XFS_LIBXFS_H],
|
AC_DEFUN([AC_PACKAGE_WANT_XFS_LIBXFS_H],
|
||||||
[ AC_CHECK_HEADERS([xfs/libxfs.h])
|
[ AC_CHECK_HEADERS([xfs/libxfs.h], [ have_libxfs=true ], [ have_libxfs=false ])
|
||||||
if test "$ac_cv_header_xfs_libxfs_h" != "yes"; then
|
AC_SUBST(have_libxfs)
|
||||||
echo
|
|
||||||
echo 'FATAL ERROR: cannot find a valid <xfs/libxfs.h> header file.'
|
|
||||||
echo 'Install or upgrade the XFS development package.'
|
|
||||||
echo 'Alternatively, run "make install-dev" from the xfsprogs source.'
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
])
|
])
|
||||||
|
|
||||||
AC_DEFUN([AC_PACKAGE_NEED_XFS_XQM_H],
|
AC_DEFUN([AC_PACKAGE_NEED_XFS_XQM_H],
|
||||||
|
|||||||
+1
-1
@@ -45,7 +45,7 @@ in
|
|||||||
*)
|
*)
|
||||||
AC_MULTILIB($enable_lib64)
|
AC_MULTILIB($enable_lib64)
|
||||||
AC_PACKAGE_NEED_XFS_XFS_H
|
AC_PACKAGE_NEED_XFS_XFS_H
|
||||||
AC_PACKAGE_NEED_XFS_LIBXFS_H
|
AC_PACKAGE_WANT_XFS_LIBXFS_H
|
||||||
AC_PACKAGE_NEED_XFS_XQM_H
|
AC_PACKAGE_NEED_XFS_XQM_H
|
||||||
AC_PACKAGE_NEED_XFSCTL_MACRO
|
AC_PACKAGE_NEED_XFSCTL_MACRO
|
||||||
AC_PACKAGE_NEED_XFS_HANDLE_H
|
AC_PACKAGE_NEED_XFS_HANDLE_H
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ LOADERFLAGS = @LDFLAGS@
|
|||||||
CFLAGS = @CFLAGS@
|
CFLAGS = @CFLAGS@
|
||||||
CPPFLAGS = @CPPFLAGS@
|
CPPFLAGS = @CPPFLAGS@
|
||||||
|
|
||||||
|
HAVE_LIBXFS = @have_libxfs@
|
||||||
LIBXFS = @libxfs@
|
LIBXFS = @libxfs@
|
||||||
LIBACL = @libacl@
|
LIBACL = @libacl@
|
||||||
LIBATTR = @libattr@
|
LIBATTR = @libattr@
|
||||||
|
|||||||
@@ -8,14 +8,9 @@ AC_DEFUN([AC_PACKAGE_NEED_XFS_XFS_H],
|
|||||||
fi
|
fi
|
||||||
])
|
])
|
||||||
|
|
||||||
AC_DEFUN([AC_PACKAGE_NEED_XFS_LIBXFS_H],
|
AC_DEFUN([AC_PACKAGE_WANT_LIBXFS_H],
|
||||||
[ AC_CHECK_HEADERS([xfs/libxfs.h])
|
[ AC_CHECK_HEADERS([xfs/libxfs.h], [ have_libxfs=true ], [ have_libxfs=false ])
|
||||||
if test "$ac_cv_header_xfs_libxfs_h" != "yes"; then
|
AC_SUBST(have_libxfs)
|
||||||
echo
|
|
||||||
echo 'FATAL ERROR: cannot find a valid <xfs/libxfs.h> header file.'
|
|
||||||
echo 'Run "make install-qa" from the xfsprogs source.'
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
])
|
])
|
||||||
|
|
||||||
AC_DEFUN([AC_PACKAGE_NEED_XFS_XQM_H],
|
AC_DEFUN([AC_PACKAGE_NEED_XFS_XQM_H],
|
||||||
|
|||||||
+5
-1
@@ -12,11 +12,15 @@ TARGETS = dirstress fill fill2 getpagesize holes lstat64 \
|
|||||||
godown resvtest writemod makeextents itrash rename \
|
godown resvtest writemod makeextents itrash rename \
|
||||||
multi_open_unlink dmiperf unwritten_sync genhashnames
|
multi_open_unlink dmiperf unwritten_sync genhashnames
|
||||||
|
|
||||||
LINUX_TARGETS = loggen xfsctl bstat t_mtab getdevicesize \
|
LINUX_TARGETS = xfsctl bstat t_mtab getdevicesize \
|
||||||
preallo_rw_pattern_reader preallo_rw_pattern_writer ftrunc trunc \
|
preallo_rw_pattern_reader preallo_rw_pattern_writer ftrunc trunc \
|
||||||
fs_perms testx looptest locktest unwritten_mmap \
|
fs_perms testx looptest locktest unwritten_mmap \
|
||||||
bulkstat_unlink_test bulkstat_unlink_test_modified t_dir_offset
|
bulkstat_unlink_test bulkstat_unlink_test_modified t_dir_offset
|
||||||
|
|
||||||
|
ifeq ($(HAVE_LIBXFS), true)
|
||||||
|
LINUX_TARGETS += loggen
|
||||||
|
endif
|
||||||
|
|
||||||
IRIX_TARGETS = open_unlink
|
IRIX_TARGETS = open_unlink
|
||||||
|
|
||||||
ifeq ($(PKG_PLATFORM),linux)
|
ifeq ($(PKG_PLATFORM),linux)
|
||||||
|
|||||||
Reference in New Issue
Block a user