public inbox for linux-xfs@vger.kernel.org
 help / color / mirror / Atom feed
From: Christoph Hellwig <hch@lst.de>
To: xfs@oss.sgi.com
Subject: [PATCH, RFC] re-enable test 010
Date: Thu, 15 May 2008 19:16:19 +0200	[thread overview]
Message-ID: <20080515171619.GA10094@lst.de> (raw)

The dbtest program required for testcase 010 hasn't been build for ages
due to various crufty autofoo magic.  The patch below just builds it
unconditionally for Linux as all distros should have the ndbm compat
bits for libgdbm in the same place.


Signed-off-by: Christoph Hellwig <hch@lst.de>

Index: xfstests/src/Makefile
===================================================================
RCS file: /cvs/xfs-cmds/xfstests/src/Makefile,v
retrieving revision 1.43
diff -u -p -r1.43 Makefile
--- xfstests/src/Makefile	3 Oct 2007 16:23:57 -0000	1.43
+++ xfstests/src/Makefile	15 May 2008 17:13:50 -0000
@@ -15,7 +15,7 @@ TARGETS = dirstress fill fill2 getpagesi
 LINUX_TARGETS = loggen xfsctl bstat t_mtab getdevicesize \
 	preallo_rw_pattern_reader preallo_rw_pattern_writer ftrunc trunc \
 	fs_perms testx looptest locktest unwritten_mmap \
-	bulkstat_unlink_test bulkstat_unlink_test_modified
+	bulkstat_unlink_test bulkstat_unlink_test_modified dbtest t_immutable
 
 IRIX_TARGETS = open_unlink
 
@@ -27,14 +27,6 @@ ifeq ($(PKG_PLATFORM),irix)
 TARGETS += $(IRIX_TARGETS)
 endif
 
-ifeq ($(HAVE_DB), true)
-TARGETS += dbtest
-endif
-
-ifeq ($(PKG_PLATFORM),linux)
-TARGETS += t_immutable
-endif
-
 CFILES = $(TARGETS:=.c)
 LDIRT = $(TARGETS)
 
@@ -50,7 +42,7 @@ truncfile: truncfile.o $(LIBTEST)
 	$(LINKTEST) $(LIBTEST) $(LDLIBS)
 
 dbtest:	dbtest.o $(LIBTEST)
-	$(LINKTEST) $(LIBTEST) $(LIBGDBM) $(LDLIBS)
+	$(LINKTEST) $(LIBTEST) -lgdbm_compat $(LDLIBS)
 
 nametest: nametest.o $(LIBTEST)
 	$(LINKTEST) $(LIBTEST) $(LDLIBS)
Index: xfstests/src/dbtest.c
===================================================================
RCS file: /cvs/xfs-cmds/xfstests/src/dbtest.c,v
retrieving revision 1.6
diff -u -p -r1.6 dbtest.c
--- xfstests/src/dbtest.c	9 Nov 2005 02:50:19 -0000	1.6
+++ xfstests/src/dbtest.c	15 May 2008 17:13:51 -0000
@@ -17,20 +17,7 @@
  */
  
 #include "global.h"
-
-#ifdef HAVE_GDBM_NDBM_H
-#include <gdbm/ndbm.h>
-#else
-#ifdef HAVE_GDBM_H
-#include <gdbm.h>
-#else
-#ifdef HAVE_NDBM_H
-#include <ndbm.h>
-#else
-bozo!
-#endif
-#endif
-#endif
+#include <gdbm-ndbm.h>
 
 
 /* #define WorkDir	"/xfs" */

             reply	other threads:[~2008-05-15 17:15 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-05-15 17:16 Christoph Hellwig [this message]
2008-05-16  5:29 ` [PATCH, RFC] re-enable test 010 Donald Douwsma

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20080515171619.GA10094@lst.de \
    --to=hch@lst.de \
    --cc=xfs@oss.sgi.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox