Do not run appliance-related checks if not building appliance

This commit is contained in:
Hilko Bengen
2012-01-21 22:56:51 +01:00
committed by Richard W.M. Jones
parent 7004fafc69
commit b6e0552ee5
15 changed files with 56 additions and 13 deletions

View File

@@ -33,6 +33,7 @@ SUBDIRS += appliance
endif
# Tests - order is important.
if ENABLE_APPLIANCE
SUBDIRS += tests/qemu
SUBDIRS += tests/guests
SUBDIRS += tests/c-api
@@ -41,6 +42,7 @@ SUBDIRS += tests/lvm
SUBDIRS += tests/luks
SUBDIRS += tests/md
SUBDIRS += tests/regressions
endif
# Extra tests don't run by default. You have to do 'make extra-tests'.
SUBDIRS += tests/extra

View File

@@ -134,4 +134,6 @@ TESTS_ENVIRONMENT = \
MALLOC_PERTURB_=$(random_val) \
$(top_builddir)/run
if ENABLE_APPLIANCE
TESTS = test-virt-cat.sh test-virt-filesystems.sh test-virt-ls.sh
endif ENABLE_APPLIANCE

View File

@@ -46,4 +46,6 @@ TESTS_ENVIRONMENT = \
MALLOC_PERTURB_=$(random_val) \
$(top_builddir)/run
if ENABLE_APPLIANCE
TESTS = test-virt-sysprep.sh
endif ENABLE_APPLIANCE

View File

@@ -80,4 +80,6 @@ TESTS_ENVIRONMENT = \
MALLOC_PERTURB_=$(random_val) \
$(top_builddir)/run
if ENABLE_APPLIANCE
TESTS = test-virt-df.sh
endif ENABLE_APPLIANCE

View File

@@ -72,4 +72,6 @@ TESTS_ENVIRONMENT = \
MALLOC_PERTURB_=$(random_val) \
$(top_builddir)/run
if ENABLE_APPLIANCE
TESTS = test-virt-edit.sh
endif ENABLE_APPLIANCE

View File

@@ -238,15 +238,19 @@ TESTS_ENVIRONMENT = \
TESTS = \
test-add-domain.sh \
test-copy.sh \
test-find0.sh \
test-guestfish-a.sh \
test-guestfish-d.sh \
test-guestfish-escapes.sh \
test-guestfish-events.sh \
test-guestfish-tilde.sh \
test-guestfish-tilde.sh
if ENABLE_APPLIANCE
TESTS += \
test-copy.sh \
test-find0.sh \
test-read_file.sh \
test-remote.sh \
test-reopen.sh \
test-stringlist.sh \
test-upload-to-dir.sh
endif

View File

@@ -74,8 +74,10 @@ stamp-guestmount.pod: guestmount.pod
# Tests.
if ENABLE_APPLIANCE
TESTS = test-fuse.sh
endif ENABLE_APPLIANCE
TESTS_ENVIRONMENT = \
top_builddir=..
endif
endif HAVE_FUSE

View File

@@ -33,7 +33,9 @@ TESTS_ENVIRONMENT = \
# Don't run the bindtests: they don't build since the addition of optargs.
# Haskell bindings are incomplete.
if ENABLE_APPLIANCE
TESTS = Guestfs005Load Guestfs010Basic
endif ENABLE_APPLIANCE
#check_DATA = Bindtests

View File

@@ -102,7 +102,11 @@ install-data-hook:
# Tests (not comprehensive).
TESTS = run-bindtests run-java-tests
TESTS = run-bindtests
if ENABLE_APPLIANCE
TESTS += run-java-tests
endif ENABLE_APPLIANCE
TESTS_ENVIRONMENT = \
JAVA=$(JAVA) \
CLASSPATH=.:t:libguestfs-$(VERSION).jar \

View File

@@ -79,11 +79,15 @@ TESTS_ENVIRONMENT = \
TESTS = run-bindtests \
t/guestfs_005_load \
t/guestfs_010_basic \
t/guestfs_070_threads \
t/guestfs_080_optargs \
t/guestfs_400_events \
t/guestfs_400_events
if ENABLE_APPLIANCE
TESTS += t/guestfs_010_basic \
t/guestfs_070_threads \
t/guestfs_400_progress
endif
noinst_DATA += bindtests \
t/guestfs_005_load \
t/guestfs_010_basic \

View File

@@ -46,9 +46,15 @@ src_deps: $(top_builddir)/src/libguestfs.la $(generator_built)
test_images:
$(MAKE) -C $(top_builddir)/tests/data
TESTS = run-bindtests run-perl-tests
TESTS = run-bindtests
test_prereq = src_deps all test_images
$(TESTS): src_deps all appliance test_images
if ENABLE_APPLIANCE
test_prereq += appliance
TESTS += run-perl-tests
endif
$(TESTS): $(test_prereq)
TESTS_ENVIRONMENT = \
$(top_builddir)/run

View File

@@ -51,6 +51,10 @@ TESTS_ENVIRONMENT = \
TMPDIR=$(top_builddir) \
PYTHON=$(PYTHON)
TESTS = run-bindtests run-python-tests
TESTS = run-bindtests
endif
if ENABLE_APPLIANCE
TESTS += run-python-tests
endif ENABLE_APPLIANCE
endif HAVE_PYTHON

View File

@@ -105,7 +105,10 @@ TESTS_ENVIRONMENT = \
MALLOC_PERTURB_=$(random_val) \
$(top_builddir)/run
TESTS = test-virt-resize.sh utils_tests
TESTS = utils_tests
if ENABLE_APPLIANCE
TESTS += test-virt-resize.sh
endif
# Dependencies.
depend: .depend

View File

@@ -98,7 +98,9 @@ TESTS_ENVIRONMENT = \
MALLOC_PERTURB_=$(random_val) \
$(top_builddir)/run
if ENABLE_APPLIANCE
TESTS = test-virt-sparsify.sh
endif ENABLE_APPLIANCE
# Dependencies.
depend: .depend

View File

@@ -61,9 +61,11 @@ TESTS_ENVIRONMENT = \
MALLOC_PERTURB_=$(random_val) \
$(top_builddir)/run
if ENABLE_APPLIANCE
TESTS = test-virt-list-filesystems.sh \
test-virt-make-fs.sh \
test-virt-tar.sh
endif ENABLE_APPLIANCE
endif