X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=Makefile.am;h=efde00078b5f3caa19a73aff93b3f053015bf3ed;hb=4091fffcd5d7b2820086e019b71eae23a2d4a9e9;hp=fc397cda2534f2d542bf8ab75cd51ea460ed2d85;hpb=d70248333edf8a5b5f509609cf2c8f7fd77d5e05;p=libguestfs.git diff --git a/Makefile.am b/Makefile.am index fc397cd..efde000 100644 --- a/Makefile.am +++ b/Makefile.am @@ -64,7 +64,8 @@ EXTRA_DIST = \ contrib/fedora-libguestfs.spec \ contrib/febootstrap/install.title \ contrib/febootstrap/install.html \ - contrib/febootstrap/install.sh + contrib/febootstrap/install.sh \ + test-bootbootboot.sh # Build the root filesystem. # Currently this is arch-dependent, so it seems like putting it in @@ -106,7 +107,8 @@ tests_LDADD = $(top_builddir)/src/libguestfs.la TESTS = tests test-bootbootboot.sh TESTS_ENVIRONMENT = \ SKIP_TEST_COMMAND=$(shell ldd test-command | grep -sq 'not a dynamic executable' || echo 1) \ - SKIP_ZEROFREE=$(shell test -x initramfs/usr/sbin/zerofree || 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) \ $(VG) $(TESTS): $(INITRAMFS) $(VMLINUZ)