X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=capitests%2FMakefile.am;h=74bfab0c9c1e656219d1dea9cf1555b88b00933d;hb=8b3e75a3c78064a9dcf4952c50fe631442313743;hp=18e49a3f3c59012508fcd7a6dec8cba691934a89;hpb=dcd8742578a57e0871d6db4797014bbfd854a57b;p=libguestfs.git

diff --git a/capitests/Makefile.am b/capitests/Makefile.am
index 18e49a3..74bfab0 100644
--- a/capitests/Makefile.am
+++ b/capitests/Makefile.am
@@ -15,8 +15,13 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-EXTRA_DIST = \
-	tests.c
+include $(top_srcdir)/subdir-rules.mk
+
+generator_built = tests.c
+
+BUILT_SOURCES = $(generator_built)
+
+EXTRA_DIST = $(BUILT_SOURCES)
 
 # Tests.  These are auto-generated from the test descriptions
 # in the generator.
@@ -24,15 +29,30 @@ EXTRA_DIST = \
 check_PROGRAMS = tests test-command
 
 tests_SOURCES = tests.c
-tests_CFLAGS = \
-	-I$(top_builddir)/src -Wall
+tests_CFLAGS = -I$(top_srcdir)/src -I$(top_builddir)/src \
+  $(WARN_CFLAGS) $(WERROR_CFLAGS)
 tests_LDADD = $(top_builddir)/src/libguestfs.la
 
+# Old version of e2fsprogs which didn't support UUIDs?
+e2fs_uuid_not_supported :=                                              \
+  $(shell r=1;                                                          \
+    test -x ../initramfs/sbin/mkswap                                    \
+      && ../initramfs/sbin/mkswap --help 2>&1 | grep -sq -- -U          \
+      && r=1;                                                           \
+    echo $$r)
+
 TESTS = tests
 TESTS_ENVIRONMENT = \
 	SKIP_TEST_COMMAND=$(shell ldd test-command | grep -sq 'not a dynamic executable' || echo 1) \
 	SKIP_TEST_COMMAND_LINES=$(shell ldd test-command | grep -sq 'not a dynamic executable' || echo 1) \
 	SKIP_TEST_ZEROFREE=$(shell test -x ../initramfs/usr/sbin/zerofree || echo 1) \
+	SKIP_TEST_NTFS_3G_PROBE=$(shell test -x ../initramfs/bin/ntfs-3g.probe || echo 1) \
+	SKIP_TEST_CHECKSUM_8=$(shell if test `find ../initramfs -name squashfs.ko | wc -l` -eq 0; then echo 1; fi) \
+	SKIP_TEST_MKSWAP_U=$(e2fs_uuid_not_supported) \
+	SKIP_TEST_SWAPON_UUID=$(e2fs_uuid_not_supported) \
+	SKIP_TEST_MKE2JOURNAL_U=$(e2fs_uuid_not_supported) \
+	SKIP_TEST_SCRUB_FILE=$(shell test -x ../initramfs/usr/bin/scrub || echo 1) \
+	SKIP_TEST_SCRUB_DEVICE=$(shell test -x ../initramfs/usr/bin/scrub || echo 1) \
 	$(VG)
 
 # Run the tests under valgrind.