[PATCH] xfstests: check for dmapi headers

[PATCH] xfstests: check for dmapi headers

[Eric Sandeen]

I'm no autoconf wizard, but I think this does the trick to allow
xfstests build to succeed when dmapi headers are missing, as
they probably will be for any distro that doesn't ship with
dmapi in the kernel, or dmapi userspace.

AFAIK the dmapi-related tests all fail gracefully with "not run."

Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
---

Index: xfstests/Makefile
===================================================================
--- xfstests.orig/Makefile
+++ xfstests/Makefile
@@ -25,8 +25,10 @@ else
 	$(SUBDIRS_MAKERULE)
 	# automake doesn't always support "default" target 
 	# so do dmapi make explicitly with "all"
+ifeq ($(HAVE_DMAPI), true)
 	cd $(TOPDIR)/dmapi; make all
 endif
+endif
 
 ifeq ($(HAVE_BUILDDEFS), yes)
 include $(BUILDRULES)
Index: xfstests/aclocal.m4
===================================================================
--- xfstests.orig/aclocal.m4
+++ xfstests/aclocal.m4
@@ -99,6 +99,11 @@ AC_DEFUN([AC_PACKAGE_WANT_AIO],
     AC_SUBST(have_aio)
   ])
 
+AC_DEFUN([AC_PACKAGE_WANT_DMAPI],
+  [ AC_CHECK_HEADERS(sys/dmapi/dmapi.h, [ have_dmapi=true ], [ have_dmapi=false ])
+    AC_SUBST(have_dmapi)
+  ])
+
 AC_DEFUN([AC_PACKAGE_NEED_ATTR_XATTR_H],
   [ AC_CHECK_HEADERS([attr/xattr.h])
     if test "$ac_cv_header_attr_xattr_h" != "yes"; then
Index: xfstests/configure.in
===================================================================
--- xfstests.orig/configure.in
+++ xfstests/configure.in
@@ -61,6 +61,7 @@ in
 
 		AC_PACKAGE_WANT_GDBM
 		AC_PACKAGE_WANT_AIO
+		AC_PACKAGE_WANT_DMAPI
 		;;
 esac
 
Index: xfstests/include/builddefs.in
===================================================================
--- xfstests.orig/include/builddefs.in
+++ xfstests/include/builddefs.in
@@ -50,6 +50,7 @@ RPM_VERSION     = @rpm_version@
 ENABLE_SHARED = @enable_shared@
 HAVE_DB = @have_db@
 HAVE_AIO = @have_aio@
+HAVE_DMAPI = @have_dmapi@
 HAVE_ATTR_LIST = @have_attr_list@
 
 GCCFLAGS = -funsigned-char -fno-strict-aliasing -Wall

Re: [PATCH] xfstests: check for dmapi headers

[Christoph Hellwig]

On Sat, Oct 25, 2008 at 01:18:35PM -0500, Eric Sandeen wrote:
> I'm no autoconf wizard, but I think this does the trick to allow
> xfstests build to succeed when dmapi headers are missing, as
> they probably will be for any distro that doesn't ship with
> dmapi in the kernel, or dmapi userspace.
> 
> AFAIK the dmapi-related tests all fail gracefully with "not run."

Looks sane to me, although the dmapi library can of course be shipped
without kernel support - it's just rather useless that way :)

Re: [PATCH] xfstests: check for dmapi headers

[Eric Sandeen]

Christoph Hellwig wrote:
> On Sat, Oct 25, 2008 at 01:18:35PM -0500, Eric Sandeen wrote:
>> I'm no autoconf wizard, but I think this does the trick to allow
>> xfstests build to succeed when dmapi headers are missing, as
>> they probably will be for any distro that doesn't ship with
>> dmapi in the kernel, or dmapi userspace.
>>
>> AFAIK the dmapi-related tests all fail gracefully with "not run."
> 
> Looks sane to me, although the dmapi library can of course be shipped
> without kernel support - it's just rather useless that way :)
> 

true, but very, very little motivation for that :)

-Eric

Re: [PATCH] xfstests: check for dmapi headers

[Dave Chinner]

On Sat, Oct 25, 2008 at 03:19:28PM -0500, Eric Sandeen wrote:
> Christoph Hellwig wrote:
> > On Sat, Oct 25, 2008 at 01:18:35PM -0500, Eric Sandeen wrote:
> >> I'm no autoconf wizard, but I think this does the trick to allow
> >> xfstests build to succeed when dmapi headers are missing, as
> >> they probably will be for any distro that doesn't ship with
> >> dmapi in the kernel, or dmapi userspace.
> >>
> >> AFAIK the dmapi-related tests all fail gracefully with "not run."
> > 
> > Looks sane to me, although the dmapi library can of course be shipped
> > without kernel support - it's just rather useless that way :)
> 
> true, but very, very little motivation for that :)

$ dpkg -l libdm0\*
Desired=Unknown/Install/Remove/Purge/Hold
| Status=Not/Inst/Cfg-files/Unpacked/Failed-cfg/Half-inst/trig-aWait/Trig-pend
|/ Err?=(none)/Hold/Reinst-required/X=both-problems (Status,Err: uppercase=bad)
||/ Name               Version            Description
+++-==================-==================-====================================================
ii  libdm0             2.2.8-1            Data Management API runtime environment
ii  libdm0-dev         2.2.8-1            Data Management API static libraries and headers
$

Cheers,

Dave.
-- 
Dave Chinner
david@fromorbit.com

Re: [PATCH] xfstests: check for dmapi headers

[Eric Sandeen]

Dave Chinner wrote:
> On Sat, Oct 25, 2008 at 03:19:28PM -0500, Eric Sandeen wrote:
>> Christoph Hellwig wrote:
>>> On Sat, Oct 25, 2008 at 01:18:35PM -0500, Eric Sandeen wrote:
>>>> I'm no autoconf wizard, but I think this does the trick to allow
>>>> xfstests build to succeed when dmapi headers are missing, as
>>>> they probably will be for any distro that doesn't ship with
>>>> dmapi in the kernel, or dmapi userspace.
>>>>
>>>> AFAIK the dmapi-related tests all fail gracefully with "not run."
>>> Looks sane to me, although the dmapi library can of course be shipped
>>> without kernel support - it's just rather useless that way :)
>> true, but very, very little motivation for that :)
> 
> $ dpkg -l libdm0\*
> Desired=Unknown/Install/Remove/Purge/Hold
> | Status=Not/Inst/Cfg-files/Unpacked/Failed-cfg/Half-inst/trig-aWait/Trig-pend
> |/ Err?=(none)/Hold/Reinst-required/X=both-problems (Status,Err: uppercase=bad)
> ||/ Name               Version            Description
> +++-==================-==================-====================================================
> ii  libdm0             2.2.8-1            Data Management API runtime environment
> ii  libdm0-dev         2.2.8-1            Data Management API static libraries and headers
> $

I meant my motivation ;)

-Eric