X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=capitests%2FMakefile.am;h=487a33f9ad84e68fe062c7d59d54fceed1c8367d;hb=11374abeadfb01252bdb02c0915d1edc79512e79;hp=0d18eaf5617e85c1f0952ff4816b26773b39a6b9;hpb=59db941bf64eae2eed6a8e6451e04aa0cbec8294;p=libguestfs.git diff --git a/capitests/Makefile.am b/capitests/Makefile.am index 0d18eaf..487a33f 100644 --- a/capitests/Makefile.am +++ b/capitests/Makefile.am @@ -30,7 +30,9 @@ check_PROGRAMS = \ test-create-handle \ test-config \ test-add-drive-opts \ - test-last-errno + test-last-errno \ + test-private-data \ + test-debug-to-file TESTS = \ tests \ @@ -38,7 +40,9 @@ TESTS = \ test-create-handle \ test-config \ test-add-drive-opts \ - test-last-errno + test-last-errno \ + test-private-data \ + test-debug-to-file # The API behind this test is not baked yet. #if HAVE_LIBVIRT @@ -50,10 +54,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) @@ -102,16 +107,32 @@ 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_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.