X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=Makefile.am;h=9fa44f2179685080a147b69eadfddfc26d610ac4;hp=fcf5f6143bbb83a5648a94487f9e73df1dac87e3;hb=123ad23a7e6df309553887affb7a44b8308a32d8;hpb=09c42a97daeae4fdccf40374620e533469a281a6

diff --git a/Makefile.am b/Makefile.am
index fcf5f61..9fa44f2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -97,13 +97,16 @@ make-initramfs.sh: make-initramfs.sh.in
 
 check_PROGRAMS = tests test-command
 
-tests_SOURCES = tests.c test-bootbootboot.sh
+tests_SOURCES = tests.c
 tests_CFLAGS = \
 	-I$(top_builddir)/src -Wall
 tests_LDADD = $(top_builddir)/src/libguestfs.la
 
-TESTS = tests
-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)