build: Reorder build sequence.

When I conceived commit dc1d0880b0, I
thought it would be a good idea to build test-data files, including
the phony guest images, during the 'make' phase.  Previously these
were built early in the 'make check' phase.

However this has two disadvantages: (a) We run the appliance
unnecessarily during builds.  For example, it is not necessary to
build the phony guests if we are going to do an 'installcheck'.
(b) Even if we are testing, the critical first time we run the
appliance is not in 'quickcheck' or 'tests/qemu', but some random
guest build.

Reorder the build sequence to fix this, and also a few other things.

This updates commit dc1d0880b0.

test-data/blank-disks/Makefile.am

@@ -33,21 +33,21 @@ CLEANFILES = $(files)
 # Blank disk images in various sizes and formats.
 blank-disk-1s.raw:
 	rm -f $@
-	$(top_builddir)/run guestfish sparse $@ 512
+	truncate -s 512 $@
 
 blank-disk-1s.qcow2:
 	qemu-img create -f qcow2 -o preallocation=metadata $@ 512
 
 blank-disk-1K.raw:
 	rm -f $@
-	$(top_builddir)/run guestfish sparse $@ 1K
+	truncate -s 1K $@
 
 blank-disk-1K.qcow2:
 	qemu-img create -f qcow2 -o preallocation=metadata $@ 1K
 
 blank-disk-1M.raw:
 	rm -f $@
-	$(top_builddir)/run guestfish sparse $@ 1M
+	truncate -s 1M $@
 
 blank-disk-1M.qcow2:
 	qemu-img create -f qcow2 -o preallocation=metadata $@ 1M

test-data/phony-guests/Makefile.am

@@ -56,10 +56,12 @@ disk_images = \
 	coreos.img \
 	windows.img
 
-noinst_DATA = $(disk_images) guests-all-good.xml
+# This is 'check_DATA' because we don't need it until 'make check'
+# time and we need the tools we have built in order to make it.
+check_DATA = $(disk_images) guests-all-good.xml
 
 CLEANFILES = \
-	$(noinst_DATA) \
+	$(check_DATA) \
 	guests-all-good.xml \
 	stamp-fedora-md.img \
 	*.tmp.*