X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=capitests%2FMakefile.am;h=b1b4e1d272e71fe27322e1b07b4b753ed74957a6;hp=71928ec1cbc8bfd201b0736fb589032ba8d3a564;hb=6ab57837216f498a08d33240c429ed678968fb78;hpb=77b2275dfcebce16ceea17ddf77a7f9d0a41c082

diff --git a/capitests/Makefile.am b/capitests/Makefile.am
index 71928ec..b1b4e1d 100644
--- a/capitests/Makefile.am
+++ b/capitests/Makefile.am
@@ -1,5 +1,5 @@
 # libguestfs
-# Copyright (C) 2009 Red Hat Inc.
+# Copyright (C) 2009-2010 Red Hat Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -15,38 +15,105 @@
 # 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
 
-# Tests.  These are auto-generated from the test descriptions
-# in the generator.
+generator_built = tests.c
 
-check_PROGRAMS = tests test-command
+BUILT_SOURCES = $(generator_built)
 
-tests_SOURCES = tests.c
-tests_CFLAGS = -I$(top_srcdir)/src -I$(top_builddir)/src -Wall
-tests_LDADD = $(top_builddir)/src/libguestfs.la
+EXTRA_DIST = $(BUILT_SOURCES)
+
+check_PROGRAMS = \
+	tests \
+	test-command \
+	test-just-header \
+	test-create-handle \
+	test-config \
+	test-add-drive-opts \
+	test-last-errno
+
+TESTS = \
+	tests \
+	test-just-header \
+	test-create-handle \
+	test-config \
+	test-add-drive-opts \
+	test-last-errno
+
+# The API behind this test is not baked yet.
+#if HAVE_LIBVIRT
+#check_PROGRAMS += test-add-libvirt-dom
+#TESTS += test-add-libvirt-dom
+#endif
+EXTRA_DIST += test-add-libvirt-dom.c
 
-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=$(shell r=1; if test -x ../initramfs/sbin/mkswap; then if ../initramfs/sbin/mkswap --help 2>&1 | grep -sq -- -U; then r=0; fi; fi; echo $$r) \
-	SKIP_TEST_SWAPON_UUID=$$SKIP_TEST_MKSWAP_U \
-	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) \
+	LIBGUESTFS_PATH=$(top_builddir)/appliance \
 	$(VG)
 
-# Run the tests under valgrind.
-
-valgrind:
-	$(MAKE) check VG="valgrind --quiet --leak-check=full"
+tests_SOURCES = tests.c
+tests_CFLAGS = -I$(top_srcdir)/src -I$(top_builddir)/src \
+  $(WARN_CFLAGS) $(WERROR_CFLAGS)
+tests_LDADD = $(top_builddir)/src/libguestfs.la
 
 # This binary must be statically linked.  It is used for testing
 # the "guestfs_command" and "guestfs_command_lines" functions.
 
 test_command_SOURCES = test-command.c
 test_command_LDFLAGS = -all-static
+
+# Hand-written C API tests.
+
+test_just_header_SOURCES = test-just-header.c
+test_just_header_CFLAGS = \
+	-I$(top_srcdir)/src -I$(top_builddir)/src \
+	$(WARN_CFLAGS) $(WERROR_CFLAGS)
+test_just_header_LDADD = \
+	$(top_builddir)/src/libguestfs.la
+
+test_create_handle_SOURCES = test-create-handle.c
+test_create_handle_CFLAGS = \
+	-I$(top_srcdir)/src -I$(top_builddir)/src \
+	$(WARN_CFLAGS) $(WERROR_CFLAGS)
+test_create_handle_LDADD = \
+	$(top_builddir)/src/libguestfs.la
+
+test_config_SOURCES = test-config.c
+test_config_CFLAGS = \
+	-I$(top_srcdir)/src -I$(top_builddir)/src \
+	$(WARN_CFLAGS) $(WERROR_CFLAGS)
+test_config_LDADD = \
+	$(top_builddir)/src/libguestfs.la
+
+test_add_drive_opts_SOURCES = test-add-drive-opts.c
+test_add_drive_opts_CFLAGS = \
+	-I$(top_srcdir)/src -I$(top_builddir)/src \
+	$(WARN_CFLAGS) $(WERROR_CFLAGS)
+test_add_drive_opts_LDADD = \
+	$(top_builddir)/src/libguestfs.la
+
+test_last_errno_SOURCES = test-last-errno.c
+test_last_errno_CFLAGS = \
+	-I$(top_srcdir)/src -I$(top_builddir)/src \
+	$(WARN_CFLAGS) $(WERROR_CFLAGS)
+test_last_errno_LDADD = \
+	$(top_builddir)/src/libguestfs.la
+
+#if HAVE_LIBVIRT
+#test_add_libvirt_dom_SOURCES = test-add-libvirt-dom.c
+#test_add_libvirt_dom_CFLAGS = \
+#	-I$(top_srcdir)/src -I$(top_builddir)/src -I$(top_srcdir)/gnulib/lib \
+#	$(LIBVIRT_CFLAGS) \
+#	$(WARN_CFLAGS) $(WERROR_CFLAGS)
+#test_add_libvirt_dom_LDADD = \
+#	$(top_builddir)/src/libguestfs.la $(LIBVIRT_LIBS) \
+#	$(LTLIBTHREAD) ../gnulib/lib/libgnu.la
+#endif
+
+# Run the tests under valgrind.
+
+valgrind:
+	$(MAKE) check VG="valgrind --quiet --leak-check=full"