X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;ds=inline;f=capitests%2FMakefile.am;h=dd2e5563e405915050dc128dcce68dec52663677;hb=349814e9d912c4f372b8fbdfb10b03749911021f;hp=f061243be5fd9607876a6bdf0d39231ee1914c3e;hpb=e2206733d1287f5809dbde954f3eb64420471b0d;p=libguestfs.git diff --git a/capitests/Makefile.am b/capitests/Makefile.am index f061243..dd2e556 100644 --- a/capitests/Makefile.am +++ b/capitests/Makefile.am @@ -16,9 +16,7 @@ # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. EXTRA_DIST = \ - tests.c \ - test-cleanup.sh \ - test-bootbootboot.sh + tests.c # Tests. These are auto-generated from the test descriptions # in the generator. @@ -26,15 +24,15 @@ 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 -Wall tests_LDADD = $(top_builddir)/src/libguestfs.la -TESTS = tests test-bootbootboot.sh +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) \ $(VG) # Run the tests under valgrind.