tests: Rename caution -> tests/qemu.

5 files changed, 2 insertions, 7 deletions

diff --git a/Makefile.am b/Makefile.am
index 5c900045..eddf4f9d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -30,7 +30,7 @@ SUBDIRS += appliance
 endif
 
 # Tests and the test-tool.
-SUBDIRS += gnulib/tests capitests caution regressions extratests test-tool
+SUBDIRS += gnulib/tests capitests tests/qemu regressions extratests test-tool
 
 # Guestfish.
 SUBDIRS += fish
diff --git a/configure.ac b/configure.ac
index 28243a29..ce38b41e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1008,7 +1008,6 @@ AC_CONFIG_FILES([Makefile
                  appliance/Makefile
                  capitests/Makefile
                  cat/Makefile
-                 caution/Makefile
                  clone/Makefile
                  csharp/Makefile
                  daemon/Makefile
@@ -1052,6 +1051,7 @@ AC_CONFIG_FILES([Makefile
                  sparsify/Makefile
                  src/Makefile
                  test-tool/Makefile
+                 tests/qemu/Makefile
                  tools/Makefile])
 AC_OUTPUT
 
diff --git a/src/guestfs.pod b/src/guestfs.pod
index f9a715ab..2e18fd6d 100644
--- a/src/guestfs.pod
+++ b/src/guestfs.pod
@@ -2926,11 +2926,6 @@ Automated tests of the C API.
 The L<virt-cat(1)>, L<virt-filesystems(1)> and L<virt-ls(1)> commands
 and documentation.
 
-=item C<caution>
-
-Safety and liveness tests of components that libguestfs depends upon
-(not of libguestfs itself).  Mainly this is for qemu and the kernel.
-
 =item C<clone>
 
 Tools for cloning virtual machines.  Currently contains
diff --git a/caution/Makefile.am b/tests/qemu/Makefile.am
index fb95a747..fb95a747 100644
--- a/caution/Makefile.am
+++ b/tests/qemu/Makefile.am
diff --git a/caution/qemu-snapshot-isolation.sh b/tests/qemu/qemu-snapshot-isolation.sh
index 384706c2..384706c2 100755
--- a/caution/qemu-snapshot-isolation.sh
+++ b/tests/qemu/qemu-snapshot-isolation.sh