X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=Makefile.am;h=771ee21d2157df746fa08352bfbba63b29a34cb0;hp=592ed9445285dac0408b08ccb1fe0319d68f8660;hb=29204fe10d6ad46bace50e82557cb95e8a0f3529;hpb=03ff42cb2e088b00c15023d456058cbcdc5d3c81

diff --git a/Makefile.am b/Makefile.am
index 592ed94..771ee21 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,7 +17,7 @@
 
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = src daemon fish examples images
+SUBDIRS = src daemon fish po examples images
 
 if HAVE_OCAML
 SUBDIRS += ocaml
@@ -95,15 +95,18 @@ make-initramfs.sh: make-initramfs.sh.in
 # Tests.  These are auto-generated from the test descriptions
 # in the generator.
 
-check_PROGRAMS = tests
+check_PROGRAMS = tests test-command
 
 tests_SOURCES = tests.c
 tests_CFLAGS = \
 	-I$(top_builddir)/src -Wall
 tests_LDADD = $(top_builddir)/src/libguestfs.la
 
-TESTS = $(check_PROGRAMS)
-TESTS_ENVIRONMENT = $(VG)
+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) \
+	$(VG)
 
 $(TESTS): $(INITRAMFS) $(VMLINUZ)
 
@@ -112,6 +115,12 @@ $(TESTS): $(INITRAMFS) $(VMLINUZ)
 valgrind:
 	$(MAKE) check VG="valgrind --quiet --leak-check=full"
 
+# 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
+
 # Manual pages.
 # guestfs-actions.pod and guestfs-structs are autogenerated.  There is
 # no include mechanism for POD, so we have to do it by hand.