X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=capitests%2FMakefile.am;h=7e35872ee121336e3dc73a26eba30eb8fd20f0d1;hp=95afa538ec157dbf70f5443ba25a78d9a591806f;hb=9ec9c97ce2ba46e56b304d3a367c86adc703160d;hpb=cb7ec8be4ce6068b6cbc6522a67826cdbd161024

diff --git a/capitests/Makefile.am b/capitests/Makefile.am
index 95afa53..7e35872 100644
--- a/capitests/Makefile.am
+++ b/capitests/Makefile.am
@@ -26,17 +26,25 @@ EXTRA_DIST = $(BUILT_SOURCES)
 check_PROGRAMS = \
 	tests \
 	test-command \
+	test-just-header \
 	test-create-handle \
 	test-config \
 	test-add-drive-opts \
-	test-last-errno
+	test-last-errno \
+	test-private-data \
+	test-user-cancel \
+	test-debug-to-file
 
 TESTS = \
 	tests \
+	test-just-header \
 	test-create-handle \
 	test-config \
 	test-add-drive-opts \
-	test-last-errno
+	test-last-errno \
+	test-private-data \
+	test-user-cancel \
+	test-debug-to-file
 
 # The API behind this test is not baked yet.
 #if HAVE_LIBVIRT
@@ -48,10 +56,11 @@ EXTRA_DIST += test-add-libvirt-dom.c
 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_CHECKSUM_8=$(shell if test `find ../initramfs -name squashfs.ko | wc -l` -eq 0; then echo 1; fi) \
 	LIBGUESTFS_PATH=$(top_builddir)/appliance \
 	$(VG)
 
+#SKIP_TEST_CHECKSUM_8=$(shell if test `find ../initramfs -name squashfs.ko | wc -l` -eq 0; then echo 1; fi)
+
 tests_SOURCES = tests.c
 tests_CFLAGS = -I$(top_srcdir)/src -I$(top_builddir)/src \
   $(WARN_CFLAGS) $(WERROR_CFLAGS)
@@ -65,6 +74,13 @@ 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 \
@@ -93,16 +109,40 @@ test_last_errno_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) \
+test_private_data_SOURCES = test-private-data.c
+test_private_data_CFLAGS = \
+	-I$(top_srcdir)/src -I$(top_builddir)/src \
 	$(WARN_CFLAGS) $(WERROR_CFLAGS)
-test_add_libvirt_dom_LDADD = \
-	$(top_builddir)/src/libguestfs.la $(LIBVIRT_LIBS) \
-	$(LTLIBTHREAD) ../gnulib/lib/libgnu.la
-endif
+test_private_data_LDADD = \
+	$(top_builddir)/src/libguestfs.la
+
+test_user_cancel_SOURCES = test-user-cancel.c
+test_user_cancel_CFLAGS = \
+	-pthread \
+	-I$(top_srcdir)/src -I$(top_builddir)/src \
+	$(WARN_CFLAGS) $(WERROR_CFLAGS)
+test_user_cancel_LDADD = \
+	$(top_builddir)/src/libguestfs.la
+
+test_debug_to_file_SOURCES = test-debug-to-file.c
+test_debug_to_file_CFLAGS = \
+	-I$(top_srcdir)/src -I$(top_builddir)/src \
+	-I$(top_srcdir)/gnulib/lib \
+	$(WARN_CFLAGS) $(WERROR_CFLAGS)
+test_debug_to_file_LDADD = \
+	$(top_builddir)/src/libguestfs.la \
+	../gnulib/lib/libgnu.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.