tests: Split images -> tests/data + tests/guests

62 files changed, 191 insertions, 175 deletions

diff --git a/.gitignore b/.gitignore
index 895227ce..dcf2af1e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -152,26 +152,6 @@ html/virt-tar.1.html
 html/virt-tar-in.1.html
 html/virt-tar-out.1.html
 html/virt-win-reg.1.html
-images/100kallnewlines
-images/100kallspaces
-images/100kallzeroes
-images/100krandom
-images/10klines
-images/abssymlink
-images/debian.img
-images/fedora.img
-images/fedora-md1.img
-images/fedora-md2.img
-images/guest-aux/fedora-name.db
-images/guest-aux/fedora-packages.db
-images/hello.b64
-images/initrd
-images/initrd-x86_64.img
-images/initrd-x86_64.img.gz
-images/test.iso
-images/test-grep.txt.gz
-images/ubuntu.img
-images/windows.img
 inspector/stamp-virt-inspector.pod
 inspector/virt-inspector
 inspector/virt-inspector.1
@@ -356,7 +336,27 @@ tests/c-api/test*.img
 tests/c-api/tests
 tests/c-api/tests.c
 tests/c-api/test*.tmp
+tests/data/100kallnewlines
+tests/data/100kallspaces
+tests/data/100kallzeroes
+tests/data/100krandom
+tests/data/10klines
+tests/data/abssymlink
+tests/data/hello.b64
+tests/data/initrd
+tests/data/initrd-x86_64.img
+tests/data/initrd-x86_64.img.gz
+tests/data/test.iso
+tests/data/test-grep.txt.gz
 tests/extra/valgrind.log
+tests/guests/debian.img
+tests/guests/fedora.img
+tests/guests/fedora-md1.img
+tests/guests/fedora-md2.img
+tests/guests/guest-aux/fedora-name.db
+tests/guests/guest-aux/fedora-packages.db
+tests/guests/ubuntu.img
+tests/guests/windows.img
 tests/regressions/rhbz501893
 tools/test.img
 tools/virt-*.1
diff --git a/.x-sc_TAB_in_indentation b/.x-sc_TAB_in_indentation
index ef5b1b66..586e1d23 100644
--- a/.x-sc_TAB_in_indentation
+++ b/.x-sc_TAB_in_indentation
@@ -1,5 +1,5 @@
 ^appliance/debian/modules/
-^images/
+^tests/data/
 ^COPYING(.LIB)?$
 ^\.gitmodules$
 (^|\/)ChangeLog[^/]*$
diff --git a/.x-sc_trailing_blank b/.x-sc_trailing_blank
index 502e6601..148e6aa2 100644
--- a/.x-sc_trailing_blank
+++ b/.x-sc_trailing_blank
@@ -1,2 +1,2 @@
-images/bin-win64.exe
+tests/data/bin-win64.exe
 *.pod
diff --git a/Makefile.am b/Makefile.am
index 9ae52175..438c5228 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,7 +20,7 @@ include $(top_srcdir)/subdir-rules.mk
 ACLOCAL_AMFLAGS = -I m4
 
 # Basic source for the library.
-SUBDIRS = gnulib/lib images generator src examples po
+SUBDIRS = gnulib/lib tests/data tests/guests generator src examples po
 
 if ENABLE_DAEMON
 SUBDIRS += daemon
diff --git a/cat/test-virt-cat.sh b/cat/test-virt-cat.sh
index 19b8d875..79844562 100755
--- a/cat/test-virt-cat.sh
+++ b/cat/test-virt-cat.sh
@@ -4,11 +4,11 @@ export LANG=C
 set -e
 
 # Read out the test files from the image using virt-cat.
-if [ "$(./virt-cat ../images/fedora.img /etc/test1)" != "abcdefg" ]; then
+if [ "$(./virt-cat ../tests/guests/fedora.img /etc/test1)" != "abcdefg" ]; then
     echo "$0: error: mismatch in file test1"
     exit 1
 fi
-if [ "$(./virt-cat ../images/fedora.img /etc/test2)" != "" ]; then
+if [ "$(./virt-cat ../tests/guests/fedora.img /etc/test2)" != "" ]; then
     echo "$0: error: mismatch in file test2"
     exit 1
 fi
diff --git a/cat/test-virt-filesystems.sh b/cat/test-virt-filesystems.sh
index f3c325c6..e664e1a2 100755
--- a/cat/test-virt-filesystems.sh
+++ b/cat/test-virt-filesystems.sh
@@ -3,7 +3,7 @@
 export LANG=C
 set -e
 
-output="$(./virt-filesystems -a ../images/fedora.img | sort)"
+output="$(./virt-filesystems -a ../tests/guests/fedora.img | sort)"
 expected="/dev/VG/LV1
 /dev/VG/LV2
 /dev/VG/LV3
@@ -16,7 +16,7 @@ if [ "$output" != "$expected" ]; then
     exit 1
 fi
 
-output="$(./virt-filesystems -a ../images/fedora.img --all --long --uuid -h --no-title | awk '{print $1}' | sort -u)"
+output="$(./virt-filesystems -a ../tests/guests/fedora.img --all --long --uuid -h --no-title | awk '{print $1}' | sort -u)"
 expected="/dev/VG
 /dev/VG/LV1
 /dev/VG/LV2
diff --git a/cat/test-virt-ls.sh b/cat/test-virt-ls.sh
index 3f702b7c..b7b02a34 100755
--- a/cat/test-virt-ls.sh
+++ b/cat/test-virt-ls.sh
@@ -4,7 +4,7 @@ export LANG=C
 set -e
 
 # Read out the test directory using virt-ls.
-if [ "$(./virt-ls ../images/fedora.img /bin)" != "ls
+if [ "$(./virt-ls ../tests/guests/fedora.img /bin)" != "ls
 test1
 test2
 test3
@@ -17,7 +17,7 @@ test7" ]; then
 fi
 
 # Try the -lR option.
-output="$(./virt-ls -lR ../images/fedora.img /boot | awk '{print $1 $2 $4}')"
+output="$(./virt-ls -lR ../tests/guests/fedora.img /boot | awk '{print $1 $2 $4}')"
 expected="d0755/boot
 d0755/boot/grub
 -0644/boot/grub/grub.conf
diff --git a/clone/test-virt-sysprep.sh b/clone/test-virt-sysprep.sh
index 1ebbde7d..32173897 100755
--- a/clone/test-virt-sysprep.sh
+++ b/clone/test-virt-sysprep.sh
@@ -26,7 +26,7 @@ fi
 
 rm -f test.img guestfish
 
-qemu-img create -f qcow2 -o backing_file=../images/fedora.img test.img
+qemu-img create -f qcow2 -o backing_file=../tests/guests/fedora.img test.img
 
 # Provide alternate 'virt-inspector' and 'guestmount' binaries
 # that run the just-built programs.
diff --git a/configure.ac b/configure.ac
index 6084a1b4..b0661a0d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1022,7 +1022,6 @@ AC_CONFIG_FILES([Makefile
                  gnulib/lib/Makefile
                  gnulib/tests/Makefile
                  haskell/Makefile
-                 images/Makefile
                  inspector/Makefile
                  java/Makefile
                  java/examples/Makefile
@@ -1049,7 +1048,9 @@ AC_CONFIG_FILES([Makefile
                  src/Makefile
                  test-tool/Makefile
                  tests/c-api/Makefile
+                 tests/data/Makefile
                  tests/extra/Makefile
+                 tests/guests/Makefile
                  tests/luks/Makefile
                  tests/lvm/Makefile
                  tests/md/Makefile
diff --git a/df/test-virt-df.sh b/df/test-virt-df.sh
index 38884e12..af503a3e 100755
--- a/df/test-virt-df.sh
+++ b/df/test-virt-df.sh
@@ -4,7 +4,7 @@ export LANG=C
 set -e
 
 # Run virt-df.
-output=$(./virt-df ../images/fedora.img)
+output=$(./virt-df ../tests/guests/fedora.img)
 
 # Check title is the first line.
 if [[ ! $output =~ ^Filesystem.* ]]; then
diff --git a/edit/test-virt-edit.sh b/edit/test-virt-edit.sh
index d43851b5..7645a7f4 100755
--- a/edit/test-virt-edit.sh
+++ b/edit/test-virt-edit.sh
@@ -5,7 +5,7 @@ set -e
 
 # Make a copy of the Fedora image so we can write to it then
 # discard it.
-cp ../images/fedora.img test.img
+cp ../tests/guests/fedora.img test.img
 
 # Edit interactively.  We have to simulate this by setting $EDITOR.
 # The command will be: echo newline >> /tmp/file
diff --git a/fish/test-copy.sh b/fish/test-copy.sh
index ea6a4cc5..b6f34226 100755
--- a/fish/test-copy.sh
+++ b/fish/test-copy.sh
@@ -32,13 +32,13 @@ rm -f test1.img
 rm -rf original copy
 
 mkdir original
-cp $srcdir/../images/known* original
-cp -P $srcdir/../images/abssymlink* original
+cp $srcdir/../tests/data/known* original
+cp -P $srcdir/../tests/data/abssymlink* original
 
 output=$(
 ../fish/guestfish -N fs -m /dev/sda1 <<EOF
 mkdir /data
-# This creates a directory /data/images/
+# This creates a directory /data/data/
 copy-in original /data
 is-file /data/original/known-1
 is-file /data/original/known-3
diff --git a/fish/test-find0.sh b/fish/test-find0.sh
index 726469c1..5fd31856 100755
--- a/fish/test-find0.sh
+++ b/fish/test-find0.sh
@@ -23,7 +23,7 @@ set -e
 rm -f test.out
 
 ../fish/guestfish <<'EOF'
-add-ro ../images/test.iso
+add-ro ../tests/data/test.iso
 run
 mount-ro /dev/sda /
 find0 / test.out
diff --git a/fish/test-read_file.sh b/fish/test-read_file.sh
index cd016e30..c6e41580 100755
--- a/fish/test-read_file.sh
+++ b/fish/test-read_file.sh
@@ -23,12 +23,12 @@ set -e
 rm -f test.out
 
 ../fish/guestfish <<'EOF' > test.out
-add-ro ../images/test.iso
+add-ro ../tests/data/test.iso
 run
 mount-ro /dev/sda /
 read-file /helloworld.tar
 EOF
 
-cmp ../images/helloworld.tar test.out
+cmp ../tests/data/helloworld.tar test.out
 
 rm -f test.out
\ No newline at end of file
diff --git a/fish/test-upload-to-dir.sh b/fish/test-upload-to-dir.sh
index 41ce5e5a..1ef24a01 100755
--- a/fish/test-upload-to-dir.sh
+++ b/fish/test-upload-to-dir.sh
@@ -24,7 +24,7 @@ set -e
 
 rm -f test1.img test.out
 
-if ../fish/guestfish -N fs -m /dev/sda1 upload ../images/test.iso / 2>test.out
+if ../fish/guestfish -N fs -m /dev/sda1 upload ../tests/data/test.iso / 2>test.out
 then
   echo "$0: expecting guestfish to return an error"
   exit 1
diff --git a/generator/generator_actions.ml b/generator/generator_actions.ml
index f7a6a6cf..7a5d786b 100644
--- a/generator/generator_actions.ml
+++ b/generator/generator_actions.ml
@@ -2818,7 +2818,7 @@ To get the checksums for many files, use C<guestfs_checksums_out>.");
   ("tar_in", (RErr, [FileIn "tarfile"; Pathname "directory"], []), 69, [],
    [InitScratchFS, Always, TestOutput (
       [["mkdir"; "/tar_in"];
-       ["tar_in"; "../images/helloworld.tar"; "/tar_in"];
+       ["tar_in"; "../data/helloworld.tar"; "/tar_in"];
        ["cat"; "/tar_in/hello"]], "hello\n")],
    "unpack tarfile to directory",
    "\
@@ -2841,7 +2841,7 @@ or C<guestfs_txz_out>.");
   ("tgz_in", (RErr, [FileIn "tarball"; Pathname "directory"], []), 71, [],
    [InitScratchFS, Always, TestOutput (
       [["mkdir"; "/tgz_in"];
-       ["tgz_in"; "../images/helloworld.tar.gz"; "/tgz_in"];
+       ["tgz_in"; "../data/helloworld.tar.gz"; "/tgz_in"];
        ["cat"; "/tgz_in/hello"]], "hello\n")],
    "unpack compressed tarball to directory",
    "\
@@ -5385,7 +5385,7 @@ or growing unnecessarily.");
   ("txz_in", (RErr, [FileIn "tarball"; Pathname "directory"], []), 229, [Optional "xz"],
    [InitScratchFS, Always, TestOutput (
       [["mkdir"; "/txz_in"];
-       ["txz_in"; "../images/helloworld.tar.xz"; "/txz_in"];
+       ["txz_in"; "../data/helloworld.tar.xz"; "/txz_in"];
        ["cat"; "/txz_in/hello"]], "hello\n")],
    "unpack compressed tarball to directory",
    "\
@@ -5482,7 +5482,7 @@ types (see C<guestfs_part_get_parttype>).");
   ("checksum_device", (RString "checksum", [String "csumtype"; Device "device"], []), 237, [],
    [InitISOFS, Always, TestOutputFileMD5 (
       [["checksum_device"; "md5"; "/dev/sdd"]],
-      "../images/test.iso")],
+      "../data/test.iso")],
    "compute MD5, SHAx or CRC checksum of the contents of a device",
    "\
 This call computes the MD5, SHAx or CRC checksum of the
@@ -5532,7 +5532,7 @@ to find out what it is for.");
 
   ("base64_in", (RErr, [FileIn "base64file"; Pathname "filename"], []), 242, [],
    [InitScratchFS, Always, TestOutput (
-      [["base64_in"; "../images/hello.b64"; "/base64_in"];
+      [["base64_in"; "../data/hello.b64"; "/base64_in"];
        ["cat"; "/base64_in"]], "hello\n")],
    "upload base64-encoded data to file",
    "\
diff --git a/generator/generator_tests_c_api.ml b/generator/generator_tests_c_api.ml
index 5b4f7a80..5d2d20a7 100644
--- a/generator/generator_tests_c_api.ml
+++ b/generator/generator_tests_c_api.ml
@@ -257,8 +257,8 @@ int main (int argc, char *argv[])
     exit (EXIT_FAILURE);
   }
 
-  if (guestfs_add_drive_ro (g, \"../../images/test.iso\") == -1) {
-    printf (\"guestfs_add_drive_ro ../../images/test.iso FAILED\\n\");
+  if (guestfs_add_drive_ro (g, \"../data/test.iso\") == -1) {
+    printf (\"guestfs_add_drive_ro ../data/test.iso FAILED\\n\");
     exit (EXIT_FAILURE);
   }
 
diff --git a/inspector/Makefile.am b/inspector/Makefile.am
index 338afe30..8ef8734e 100644
--- a/inspector/Makefile.am
+++ b/inspector/Makefile.am
@@ -101,18 +101,18 @@ endif
 
 example-debian.xml:
 	rm -f $@ $@-t
-	../run $(builddir)/virt-inspector ../images/debian.img > $@-t
+	../run $(builddir)/virt-inspector ../tests/guests/debian.img > $@-t
 	mv $@-t $@
 example-fedora.xml:
 	rm -f $@ $@-t
-	../run $(builddir)/virt-inspector ../images/fedora.img > $@-t
+	../run $(builddir)/virt-inspector ../tests/guests/fedora.img > $@-t
 	mv $@-t $@
 example-ubuntu.xml:
 	rm -f $@ $@-t
-	../run $(builddir)/virt-inspector ../images/ubuntu.img > $@-t
+	../run $(builddir)/virt-inspector ../tests/guests/ubuntu.img > $@-t
 	mv $@-t $@
 example-windows.xml:
 	rm -f $@ $@-t
-	../run $(builddir)/virt-inspector ../images/windows.img | \
+	../run $(builddir)/virt-inspector ../tests/guests/windows.img | \
 	    fgrep -v '<uuid>' > $@-t
 	mv $@-t $@
diff --git a/perl/Makefile.am b/perl/Makefile.am
index eff00596..e924cb1d 100644
--- a/perl/Makefile.am
+++ b/perl/Makefile.am
@@ -46,7 +46,7 @@ src_deps: $(top_builddir)/src/libguestfs.la $(generator_built)
 # Images used by tests
 .PHONY: test_images
 test_images:
-	$(MAKE) -C $(top_builddir)/images
+	$(MAKE) -C $(top_builddir)/tests/data
 
 TESTS = run-bindtests run-perl-tests
 
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 9a18eadd..380a3c7d 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -137,10 +137,6 @@ perl/lib/Sys/Guestfs/Lib.pm
 php/extension/guestfs_php.c
 python/guestfs-py-byhand.c
 python/guestfs-py.c
-regressions/rhbz501893.c
-regressions/test-launch-race.pl
-regressions/test-lvm-mapping.pl
-regressions/test-noexec-stack.pl
 rescue/virt-rescue.c
 resize/progress_c.c
 ruby/ext/guestfs/_guestfs.c
diff --git a/src/guestfs.pod b/src/guestfs.pod
index 3bad6e63..f7740b6b 100644
--- a/src/guestfs.pod
+++ b/src/guestfs.pod
@@ -2964,12 +2964,6 @@ L<guestmount(1)>, FUSE (userspace filesystem) built on top of libguestfs.
 The crucially important generator, used to automatically generate
 large amounts of boilerplate C code for things like RPC and bindings.
 
-=item C<images>
-
-Files used by the test suite.
-
-Some "phony" guest images which we test against.
-
 =item C<inspector>
 
 L<virt-inspector(1)>, the virtual machine image inspector.
diff --git a/images/Makefile.am b/tests/data/Makefile.am
index e413750d..43f40a19 100644
--- a/images/Makefile.am
+++ b/tests/data/Makefile.am
@@ -18,7 +18,7 @@
 include $(top_srcdir)/subdir-rules.mk
 
 # Old RHEL 5 autoconf doesn't have builddir.
-builddir ?= $(top_builddir)/images
+builddir ?= $(top_builddir)/tests/data
 
 EXTRA_DIST = \
 	helloworld.tar \
@@ -36,32 +36,14 @@ EXTRA_DIST = \
 	lib-win32.dll \
 	lib-win64.dll \
 	lib-x86_64.so \
-	test-grep.txt \
-	guest-aux/make-debian-img.sh \
-	guest-aux/debian-packages \
-	guest-aux/make-fedora-img.pl \
-	guest-aux/fedora-name.db.txt \
-	guest-aux/fedora-name.db \
-	guest-aux/fedora-packages.db.txt \
-	guest-aux/fedora-packages.db \
-	guest-aux/make-ubuntu-img.sh \
-	guest-aux/make-windows-img.sh \
-	guest-aux/windows-software \
-	guest-aux/windows-software.reg \
-	guest-aux/windows-system \
-	guest-aux/windows-system.reg \
-	guest-aux/minimal-hive
+	test-grep.txt
 
 noinst_DATA = test.iso
 
-# 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 = debian.img fedora.img fedora-md1.img fedora-md2.img ubuntu.img windows.img
-
 CLEANFILES = \
 	test.iso test.sqsh \
 	100kallzeroes 100kallnewlines 100kallspaces 100krandom 10klines \
-	initrd $(check_DATA)
+	initrd
 
 images_files_src = \
 	$(srcdir)/helloworld.tar \
@@ -168,66 +150,3 @@ $(builddir)/test-grep.txt.gz: test-grep.txt
 	rm -f $@ $@-t
 	gzip --best -c $< > $@-t
 	mv $@-t $@
-
-# Make a (dummy) Fedora image.
-fedora.img: guest-aux/make-fedora-img.pl \
-		guest-aux/fedora-name.db \
-		guest-aux/fedora-packages.db
-	TMPDIR=$(top_builddir) \
-	SRCDIR=$(srcdir) \
-	LAYOUT=partitions \
-	../run $<
-
-# Make a (dummy) Fedora image using md devices
-fedora-md1.img fedora-md2.img: guest-aux/make-fedora-img.pl \
-		guest-aux/fedora-name.db \
-		guest-aux/fedora-packages.db
-	TMPDIR=$(top_builddir) \
-	SRCDIR=$(srcdir) \
-	LAYOUT=partitions-md \
-	../run $<
-
-guest-aux/fedora-name.db: guest-aux/fedora-name.db.txt
-	rm -f $@ $@-t
-	mkdir -p guest-aux
-	$(DB_LOAD) $@-t < $<
-	mv $@-t $@
-
-guest-aux/fedora-packages.db: guest-aux/fedora-packages.db.txt
-	rm -f $@ $@-t
-	mkdir -p guest-aux
-	$(DB_LOAD) $@-t < $<
-	mv $@-t $@
-
-# Make a (dummy) Debian image.
-debian.img: guest-aux/make-debian-img.sh
-	TMPDIR=$(top_builddir) \
-	SRCDIR=$(srcdir) \
-	bash $<
-
-# Make a (dummy) Ubuntu image.
-ubuntu.img: guest-aux/make-ubuntu-img.sh
-	TMPDIR=$(top_builddir) \
-	SRCDIR=$(srcdir) \
-	bash $<
-
-# Make a (dummy) Windows image.
-windows.img: guest-aux/make-windows-img.sh \
-	     guest-aux/windows-software guest-aux/windows-system
-	TMPDIR=$(top_builddir) \
-	SRCDIR=$(srcdir) \
-	bash $<
-
-# Since users might not have the tools needed to create this, we
-# also distribute these files.
-guest-aux/windows-software: guest-aux/windows-software.reg
-	rm -f $@ $@-t
-	cp guest-aux/minimal-hive $@-t
-	hivexregedit --merge $@-t --prefix 'HKEY_LOCAL_MACHINE\SOFTWARE' $<
-	mv $@-t $@
-
-guest-aux/windows-system: guest-aux/windows-system.reg
-	rm -f $@ $@-t
-	cp guest-aux/minimal-hive $@-t
-	hivexregedit --merge $@-t --prefix 'HKEY_LOCAL_MACHINE\SYSTEM' $<
-	mv $@-t $@
diff --git a/images/README-binfiles b/tests/data/README-binfiles
index f99fc847..f99fc847 100644
--- a/images/README-binfiles
+++ b/tests/data/README-binfiles
diff --git a/images/bin-i586-dynamic b/tests/data/bin-i586-dynamic
index 4f770633..4f770633 100755
--- a/images/bin-i586-dynamic
+++ b/tests/data/bin-i586-dynamic
diff --git a/images/bin-sparc-dynamic b/tests/data/bin-sparc-dynamic
index 138839af..138839af 100755
--- a/images/bin-sparc-dynamic
+++ b/tests/data/bin-sparc-dynamic
diff --git a/images/bin-win32.exe b/tests/data/bin-win32.exe
index db6d5758..db6d5758 100755
--- a/images/bin-win32.exe
+++ b/tests/data/bin-win32.exe
diff --git a/images/bin-win64.exe b/tests/data/bin-win64.exe
index 98bddc02..98bddc02 100755
--- a/images/bin-win64.exe
+++ b/tests/data/bin-win64.exe
diff --git a/images/bin-x86_64-dynamic b/tests/data/bin-x86_64-dynamic
index 033ac759..033ac759 100755
--- a/images/bin-x86_64-dynamic
+++ b/tests/data/bin-x86_64-dynamic
diff --git a/images/empty b/tests/data/empty
index e69de29b..e69de29b 100644
--- a/images/empty
+++ b/tests/data/empty
diff --git a/images/helloworld.tar b/tests/data/helloworld.tar
index 191a31b2..191a31b2 100644
--- a/images/helloworld.tar
+++ b/tests/data/helloworld.tar
diff --git a/images/helloworld.tar.gz b/tests/data/helloworld.tar.gz
index 9d36cc97..9d36cc97 100644
--- a/images/helloworld.tar.gz
+++ b/tests/data/helloworld.tar.gz
diff --git a/images/helloworld.tar.xz b/tests/data/helloworld.tar.xz
index 661f1a20..661f1a20 100644
--- a/images/helloworld.tar.xz
+++ b/tests/data/helloworld.tar.xz
diff --git a/images/known-1 b/tests/data/known-1
index 8baef1b4..8baef1b4 100644
--- a/images/known-1
+++ b/tests/data/known-1
diff --git a/images/known-2 b/tests/data/known-2
index 0373d933..0373d933 100644
--- a/images/known-2
+++ b/tests/data/known-2
diff --git a/images/known-3 b/tests/data/known-3
index 3ac370d7..3ac370d7 100644
--- a/images/known-3
+++ b/tests/data/known-3
diff --git a/images/known-4 b/tests/data/known-4
index f5bc74f6..f5bc74f6 100644
--- a/images/known-4
+++ b/tests/data/known-4
diff --git a/images/known-5 b/tests/data/known-5
index 3122d943..3122d943 100644
--- a/images/known-5
+++ b/tests/data/known-5
diff --git a/images/lib-i586.so b/tests/data/lib-i586.so
index e82023a1..e82023a1 100755
--- a/images/lib-i586.so
+++ b/tests/data/lib-i586.so
diff --git a/images/lib-sparc.so b/tests/data/lib-sparc.so
index 7feec75e..7feec75e 100755
--- a/images/lib-sparc.so
+++ b/tests/data/lib-sparc.so
diff --git a/images/lib-win32.dll b/tests/data/lib-win32.dll
index e1a2d2e6..e1a2d2e6 100755
--- a/images/lib-win32.dll
+++ b/tests/data/lib-win32.dll
diff --git a/images/lib-win64.dll b/tests/data/lib-win64.dll
index ca94485c..ca94485c 100755
--- a/images/lib-win64.dll
+++ b/tests/data/lib-win64.dll
diff --git a/images/lib-x86_64.so b/tests/data/lib-x86_64.so
index 8cee4d20..8cee4d20 100755
--- a/images/lib-x86_64.so
+++ b/tests/data/lib-x86_64.so
diff --git a/images/mbr-ext2-empty.img.gz b/tests/data/mbr-ext2-empty.img.gz
index 5438c1dd..5438c1dd 100644
--- a/images/mbr-ext2-empty.img.gz
+++ b/tests/data/mbr-ext2-empty.img.gz
diff --git a/images/test-grep.txt b/tests/data/test-grep.txt
index 1d24b9a0..1d24b9a0 100644
--- a/images/test-grep.txt
+++ b/tests/data/test-grep.txt
diff --git a/tests/extra/Makefile.am b/tests/extra/Makefile.am
index 7d1cc22e..582fa555 100644
--- a/tests/extra/Makefile.am
+++ b/tests/extra/Makefile.am
@@ -104,22 +104,22 @@ test-tools-null:
 
 # Invocations of tools on internal images shouldn't leak memory.
 test-tools-internal:
-	$(RUN_VG) ../../cat/virt-cat -a ../images/fedora.img /etc/fstab >/dev/null
-	$(RUN_VG) ../../cat/virt-filesystems -a ../images/fedora.img >/dev/null
-	$(RUN_VG) ../../cat/virt-filesystems -a ../images/fedora.img --all --long -h --uuid >/dev/null
-	$(RUN_VG) ../../cat/virt-ls -a ../images/fedora.img / >/dev/null
-	$(RUN_VG) ../../cat/virt-ls -a ../images/fedora.img -l / >/dev/null
-	$(RUN_VG) ../../cat/virt-ls -a ../images/fedora.img -R / >/dev/null
-	$(RUN_VG) ../../cat/virt-ls -a ../images/fedora.img -lR / >/dev/null
-	$(RUN_VG) ../../df/virt-df -a ../images/fedora.img >/dev/null
-	$(RUN_VG) ../../df/virt-df -a ../images/fedora.img -h >/dev/null
-	$(RUN_VG) ../../fish/guestfish -a ../images/fedora.img run
-	$(RUN_VG) ../../fish/guestfish -a ../images/fedora.img -i exit
-	$(RUN_VG) ../../inspector/virt-inspector -a ../images/debian.img >/dev/null
-	$(RUN_VG) ../../inspector/virt-inspector -a ../images/fedora.img >/dev/null
-	$(RUN_VG) ../../inspector/virt-inspector -a ../images/fedora-md1.img -a ../images/fedora-md2.img >/dev/null
-	$(RUN_VG) ../../inspector/virt-inspector -a ../images/ubuntu.img >/dev/null
-	$(RUN_VG) ../../inspector/virt-inspector -a ../images/windows.img >/dev/null
+	$(RUN_VG) ../../cat/virt-cat -a ../guests/fedora.img /etc/fstab >/dev/null
+	$(RUN_VG) ../../cat/virt-filesystems -a ../guests/fedora.img >/dev/null
+	$(RUN_VG) ../../cat/virt-filesystems -a ../guests/fedora.img --all --long -h --uuid >/dev/null
+	$(RUN_VG) ../../cat/virt-ls -a ../guests/fedora.img / >/dev/null
+	$(RUN_VG) ../../cat/virt-ls -a ../guests/fedora.img -l / >/dev/null
+	$(RUN_VG) ../../cat/virt-ls -a ../guests/fedora.img -R / >/dev/null
+	$(RUN_VG) ../../cat/virt-ls -a ../guests/fedora.img -lR / >/dev/null
+	$(RUN_VG) ../../df/virt-df -a ../guests/fedora.img >/dev/null
+	$(RUN_VG) ../../df/virt-df -a ../guests/fedora.img -h >/dev/null
+	$(RUN_VG) ../../fish/guestfish -a ../guests/fedora.img run
+	$(RUN_VG) ../../fish/guestfish -a ../guests/fedora.img -i exit
+	$(RUN_VG) ../../inspector/virt-inspector -a ../guests/debian.img >/dev/null
+	$(RUN_VG) ../../inspector/virt-inspector -a ../guests/fedora.img >/dev/null
+	$(RUN_VG) ../../inspector/virt-inspector -a ../guests/fedora-md1.img -a ../guests/fedora-md2.img >/dev/null
+	$(RUN_VG) ../../inspector/virt-inspector -a ../guests/ubuntu.img >/dev/null
+	$(RUN_VG) ../../inspector/virt-inspector -a ../guests/windows.img >/dev/null
 
 # Invocations of tools on real images shouldn't leak memory.
 test-df-real:
diff --git a/tests/guests/Makefile.am b/tests/guests/Makefile.am
new file mode 100644
index 00000000..ee28034a
--- /dev/null
+++ b/tests/guests/Makefile.am
@@ -0,0 +1,106 @@
+# libguestfs test images
+# Copyright (C) 2009-2010 Red Hat Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+include $(top_srcdir)/subdir-rules.mk
+
+# Old RHEL 5 autoconf doesn't have builddir.
+builddir ?= $(top_builddir)/tests/guests
+
+EXTRA_DIST = \
+	guest-aux/make-debian-img.sh \
+	guest-aux/debian-packages \
+	guest-aux/make-fedora-img.pl \
+	guest-aux/fedora-name.db.txt \
+	guest-aux/fedora-name.db \
+	guest-aux/fedora-packages.db.txt \
+	guest-aux/fedora-packages.db \
+	guest-aux/make-ubuntu-img.sh \
+	guest-aux/make-windows-img.sh \
+	guest-aux/windows-software \
+	guest-aux/windows-software.reg \
+	guest-aux/windows-system \
+	guest-aux/windows-system.reg \
+	guest-aux/minimal-hive
+
+# 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 = debian.img fedora.img fedora-md1.img fedora-md2.img ubuntu.img windows.img
+
+CLEANFILES = $(check_DATA)
+
+# Make a (dummy) Fedora image.
+fedora.img: guest-aux/make-fedora-img.pl \
+		guest-aux/fedora-name.db \
+		guest-aux/fedora-packages.db
+	TMPDIR=$(top_builddir) \
+	SRCDIR=$(srcdir) \
+	LAYOUT=partitions \
+	../../run $<
+
+# Make a (dummy) Fedora image using md devices
+fedora-md1.img fedora-md2.img: guest-aux/make-fedora-img.pl \
+		guest-aux/fedora-name.db \
+		guest-aux/fedora-packages.db
+	TMPDIR=$(top_builddir) \
+	SRCDIR=$(srcdir) \
+	LAYOUT=partitions-md \
+	../../run $<
+
+guest-aux/fedora-name.db: guest-aux/fedora-name.db.txt
+	rm -f $@ $@-t
+	mkdir -p guest-aux
+	$(DB_LOAD) $@-t < $<
+	mv $@-t $@
+
+guest-aux/fedora-packages.db: guest-aux/fedora-packages.db.txt
+	rm -f $@ $@-t
+	mkdir -p guest-aux
+	$(DB_LOAD) $@-t < $<
+	mv $@-t $@
+
+# Make a (dummy) Debian image.
+debian.img: guest-aux/make-debian-img.sh
+	TMPDIR=$(top_builddir) \
+	SRCDIR=$(srcdir) \
+	bash $<
+
+# Make a (dummy) Ubuntu image.
+ubuntu.img: guest-aux/make-ubuntu-img.sh
+	TMPDIR=$(top_builddir) \
+	SRCDIR=$(srcdir) \
+	bash $<
+
+# Make a (dummy) Windows image.
+windows.img: guest-aux/make-windows-img.sh \
+	     guest-aux/windows-software guest-aux/windows-system
+	TMPDIR=$(top_builddir) \
+	SRCDIR=$(srcdir) \
+	bash $<
+
+# Since users might not have the tools needed to create this, we
+# also distribute these files.
+guest-aux/windows-software: guest-aux/windows-software.reg
+	rm -f $@ $@-t
+	cp guest-aux/minimal-hive $@-t
+	hivexregedit --merge $@-t --prefix 'HKEY_LOCAL_MACHINE\SOFTWARE' $<
+	mv $@-t $@
+
+guest-aux/windows-system: guest-aux/windows-system.reg
+	rm -f $@ $@-t
+	cp guest-aux/minimal-hive $@-t
+	hivexregedit --merge $@-t --prefix 'HKEY_LOCAL_MACHINE\SYSTEM' $<
+	mv $@-t $@
diff --git a/images/guest-aux/debian-packages b/tests/guests/guest-aux/debian-packages
index 38afc975..38afc975 100644
--- a/images/guest-aux/debian-packages
+++ b/tests/guests/guest-aux/debian-packages
diff --git a/images/guest-aux/fedora-name.db.txt b/tests/guests/guest-aux/fedora-name.db.txt
index 105b0fec..105b0fec 100644
--- a/images/guest-aux/fedora-name.db.txt
+++ b/tests/guests/guest-aux/fedora-name.db.txt
diff --git a/images/guest-aux/fedora-packages.db.txt b/tests/guests/guest-aux/fedora-packages.db.txt
index 3939d6bd..3939d6bd 100644
--- a/images/guest-aux/fedora-packages.db.txt
+++ b/tests/guests/guest-aux/fedora-packages.db.txt
diff --git a/images/guest-aux/make-debian-img.sh b/tests/guests/guest-aux/make-debian-img.sh
index ade23311..b936f817 100755
--- a/images/guest-aux/make-debian-img.sh
+++ b/tests/guests/guest-aux/make-debian-img.sh
@@ -31,7 +31,7 @@ LABEL=BOOT /boot ext2 default 0 0
 EOF
 
 # Create a disk image.
-../run ../fish/guestfish <<EOF
+../../run ../../fish/guestfish <<EOF
 sparse debian.img.tmp 512M
 run
 
@@ -82,7 +82,7 @@ write /etc/hostname "debian.invalid"
 
 upload ${SRCDIR}/guest-aux/debian-packages /var/lib/dpkg/status
 
-upload ${SRCDIR}/bin-x86_64-dynamic /bin/ls
+upload ${SRCDIR}/../data/bin-x86_64-dynamic /bin/ls
 
 mkdir /boot/grub
 touch /boot/grub/grub.conf
diff --git a/images/guest-aux/make-fedora-img.pl b/tests/guests/guest-aux/make-fedora-img.pl
index de72086a..eb0cf770 100755
--- a/images/guest-aux/make-fedora-img.pl
+++ b/tests/guests/guest-aux/make-fedora-img.pl
@@ -157,7 +157,7 @@ if (-f 'mdadm.tmp') {
 $g->upload('guest-aux/fedora-name.db', '/var/lib/rpm/Name');
 $g->upload('guest-aux/fedora-packages.db', '/var/lib/rpm/Packages');
 
-$g->upload($ENV{SRCDIR}.'/bin-x86_64-dynamic', '/bin/ls');
+$g->upload($ENV{SRCDIR}.'/../data/bin-x86_64-dynamic', '/bin/ls');
 
 $g->mkdir('/boot/grub');
 $g->touch('/boot/grub/grub.conf');
diff --git a/images/guest-aux/make-ubuntu-img.sh b/tests/guests/guest-aux/make-ubuntu-img.sh
index 0c4d60a1..e55c7908 100755
--- a/images/guest-aux/make-ubuntu-img.sh
+++ b/tests/guests/guest-aux/make-ubuntu-img.sh
@@ -36,7 +36,7 @@ DISTRIB_DESCRIPTION="Ubuntu 10.10 (Phony Pharaoh)"
 EOF
 
 # Create a disk image.
-../run ../fish/guestfish <<EOF
+../../run ../../fish/guestfish <<EOF
 sparse ubuntu.img.tmp 512M
 run
 
@@ -71,7 +71,7 @@ write /etc/hostname "ubuntu.invalid"
 
 upload ${SRCDIR}/guest-aux/debian-packages /var/lib/dpkg/status
 
-upload ${SRCDIR}/bin-x86_64-dynamic /bin/ls
+upload ${SRCDIR}/../data/bin-x86_64-dynamic /bin/ls
 
 mkdir /boot/grub
 touch /boot/grub/grub.conf
diff --git a/images/guest-aux/make-windows-img.sh b/tests/guests/guest-aux/make-windows-img.sh
index ec6aa47e..74546302 100755
--- a/images/guest-aux/make-windows-img.sh
+++ b/tests/guests/guest-aux/make-windows-img.sh
@@ -25,7 +25,7 @@ set -e
 # ntfs-3g/ntfsprogs then we cannot create a Windows phony image.
 # Nothing actually uses windows.img in the standard build so we can
 # just 'touch' it and emit a warning.
-if ! ../run ../fish/guestfish -a /dev/null run : available "ntfs3g ntfsprogs"; then
+if ! ../../run ../../fish/guestfish -a /dev/null run : available "ntfs3g ntfsprogs"; then
   echo "***"
   echo "Warning: cannot create windows.img because there is no NTFS"
   echo "support in this build of libguestfs.  Just touching the output"
@@ -36,7 +36,7 @@ if ! ../run ../fish/guestfish -a /dev/null run : available "ntfs3g ntfsprogs"; t
 fi
 
 # Create a disk image.
-../run ../fish/guestfish <<EOF
+../../run ../../fish/guestfish <<EOF
 sparse windows.img.tmp 512M
 run
 
@@ -61,7 +61,7 @@ mkdir-p /Windows/System32/Config
 upload ${SRCDIR}/guest-aux/windows-software /Windows/System32/Config/SOFTWARE
 upload ${SRCDIR}/guest-aux/windows-system /Windows/System32/Config/SYSTEM
 
-upload ${SRCDIR}/bin-win32.exe /Windows/System32/cmd.exe
+upload ${SRCDIR}/../data/bin-win32.exe /Windows/System32/cmd.exe
 
 mkdir "/Program Files"
 touch /autoexec.bat
diff --git a/images/guest-aux/minimal-hive b/tests/guests/guest-aux/minimal-hive
index 3f4ee58c..3f4ee58c 100755
--- a/images/guest-aux/minimal-hive
+++ b/tests/guests/guest-aux/minimal-hive
diff --git a/images/guest-aux/windows-software b/tests/guests/guest-aux/windows-software
index d936ea88..d936ea88 100755
--- a/images/guest-aux/windows-software
+++ b/tests/guests/guest-aux/windows-software
diff --git a/images/guest-aux/windows-software.reg b/tests/guests/guest-aux/windows-software.reg
index 2c0f41ce..2c0f41ce 100644
--- a/images/guest-aux/windows-software.reg
+++ b/tests/guests/guest-aux/windows-software.reg
diff --git a/images/guest-aux/windows-system b/tests/guests/guest-aux/windows-system
index 3a232142..3a232142 100755
--- a/images/guest-aux/windows-system
+++ b/tests/guests/guest-aux/windows-system
diff --git a/images/guest-aux/windows-system.reg b/tests/guests/guest-aux/windows-system.reg
index 5478d2de..5478d2de 100644
--- a/images/guest-aux/windows-system.reg
+++ b/tests/guests/guest-aux/windows-system.reg
diff --git a/tests/md/test-inspect-fstab-md.sh b/tests/md/test-inspect-fstab-md.sh
index 2a6cb6a9..1804d33e 100755
--- a/tests/md/test-inspect-fstab-md.sh
+++ b/tests/md/test-inspect-fstab-md.sh
@@ -35,8 +35,8 @@ guestfish=../../fish/guestfish
 rm -f test1.img test.fstab test.output
 
 # First, test the regular fedora image, which specifies /boot as /dev/md0
-cp ../../images/fedora-md1.img test1.img
-cp ../../images/fedora-md2.img test2.img
+cp ../guests/fedora-md1.img test1.img
+cp ../guests/fedora-md2.img test2.img
 
 $guestfish -i test[12].img <<'EOF' | sort > test.output
   exists /boot/grub/grub.conf
diff --git a/tests/md/test-inspect-fstab.sh b/tests/md/test-inspect-fstab.sh
index 72a11fad..576ce031 100755
--- a/tests/md/test-inspect-fstab.sh
+++ b/tests/md/test-inspect-fstab.sh
@@ -28,7 +28,7 @@ rm -f test1.img test.fstab test.output
 
 # Start with the regular (good) fedora image, modify /etc/fstab
 # and then inspect it.
-cp ../../images/fedora.img test1.img
+cp ../guests/fedora.img test1.img
 
 cat <<'EOF' > test.fstab
 /dev/VG/Root / ext2 default 0 0
diff --git a/tools/test-virt-list-filesystems.sh b/tools/test-virt-list-filesystems.sh
index bd4e4e70..210ea131 100755
--- a/tools/test-virt-list-filesystems.sh
+++ b/tools/test-virt-list-filesystems.sh
@@ -5,7 +5,7 @@ set -e
 
 # Run virt-list-filesystems.
 # Only columns 1 & 2 are guaranteed, we may add more in future.
-if [ "$(./virt-list-filesystems -l ../images/fedora.img |
+if [ "$(./virt-list-filesystems -l ../tests/guests/fedora.img |
         sort | awk '{print $1 $2}')" \
     != \
 "/dev/VG/LV1ext2
diff --git a/tools/test-virt-tar.sh b/tools/test-virt-tar.sh
index dec4f482..14179890 100755
--- a/tools/test-virt-tar.sh
+++ b/tools/test-virt-tar.sh
@@ -4,7 +4,7 @@ export LANG=C
 set -e
 
 # Read out the test directory using virt-tar.
-./virt-tar -x ../images/fedora.img /bin test.tar
+./virt-tar -x ../tests/guests/fedora.img /bin test.tar
 
 if [ "$(tar tf test.tar | sort)" != "./
 ./ls