From 1edf00d3bdb38241007bc9c789bf9710f6f5c45c Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Thu, 22 Dec 2011 13:12:43 +0000
Subject: [PATCH] tests: Finalize the order we run the tests.

---
 Makefile.am            | 18 ++++++++++++++----
 tests/qemu/Makefile.am |  1 +
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 725d12c..350c579 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 ad73510..402921f 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
 
-- 
1.8.3.1