diff options
| author | Richard W.M. Jones <rjones@redhat.com> | 2011-12-22 13:12:43 +0000 |
|---|---|---|
| committer | Richard W.M. Jones <rjones@redhat.com> | 2011-12-22 15:48:13 +0000 |
| commit | 1edf00d3bdb38241007bc9c789bf9710f6f5c45c (patch) | |
| tree | 50e6c5d5184f4e74db6c867b2ccc79056c441882 | |
| parent | d24e088dc3475db4496e5cbd67c143c25ef12b1e (diff) | |
| download | libguestfs-1edf00d3bdb38241007bc9c789bf9710f6f5c45c.tar.gz libguestfs-1edf00d3bdb38241007bc9c789bf9710f6f5c45c.tar.xz libguestfs-1edf00d3bdb38241007bc9c789bf9710f6f5c45c.zip | |
tests: Finalize the order we run the tests.
| -rw-r--r-- | Makefile.am | 18 | ||||
| -rw-r--r-- | tests/qemu/Makefile.am | 1 |
2 files changed, 15 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am index 725d12cf..350c579a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,8 +19,11 @@ include $(top_srcdir)/subdir-rules.mk ACLOCAL_AMFLAGS = -I m4 +# Gnulib - must be built and tested before the library. +SUBDIRS = gnulib/lib gnulib/tests + # Basic source for the library. -SUBDIRS = gnulib/lib tests/data tests/guests generator src examples po +SUBDIRS += tests/data generator src examples po if ENABLE_DAEMON SUBDIRS += daemon @@ -29,10 +32,17 @@ if ENABLE_APPLIANCE SUBDIRS += appliance endif -# Tests. -SUBDIRS += gnulib/tests tests/c-api tests/qemu -SUBDIRS += tests/protocol tests/lvm tests/luks tests/md +# Tests - order is important. +SUBDIRS += tests/qemu +SUBDIRS += tests/guests +SUBDIRS += tests/c-api +SUBDIRS += tests/protocol +SUBDIRS += tests/lvm +SUBDIRS += tests/luks +SUBDIRS += tests/md SUBDIRS += tests/regressions + +# Extra tests don't run by default. You have to do 'make extra-tests'. SUBDIRS += tests/extra # libguestfs-test-tool diff --git a/tests/qemu/Makefile.am b/tests/qemu/Makefile.am index ad735101..402921f7 100644 --- a/tests/qemu/Makefile.am +++ b/tests/qemu/Makefile.am @@ -17,6 +17,7 @@ # Safety and liveness tests of components that libguestfs depends upon # (not of libguestfs itself). Mainly this is for qemu and the kernel. +# This test is the first to run. include $(top_srcdir)/subdir-rules.mk |