tests: Rename extratests -> tests/extra.

6 files changed, 39 insertions, 44 deletions

diff --git a/.gitignore b/.gitignore
index 9271d74f..895227ce 100644
--- a/.gitignore
+++ b/.gitignore
@@ -83,7 +83,6 @@ examples/stamp-guestfs-examples.pod
 examples/stamp-guestfs-recipes.pod
 examples/stamp-guestfs-testing.pod
 examples/virt-dhcp-address
-extratests/valgrind.log
 fish/cmds.c
 fish/cmds_gperf.c
 fish/cmds_gperf.gperf
@@ -357,6 +356,7 @@ tests/c-api/test*.img
 tests/c-api/tests
 tests/c-api/tests.c
 tests/c-api/test*.tmp
+tests/extra/valgrind.log
 tests/regressions/rhbz501893
 tools/test.img
 tools/virt-*.1
diff --git a/Makefile.am b/Makefile.am
index 31da8755..9ae52175 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -33,7 +33,7 @@ endif
 SUBDIRS += gnulib/tests tests/c-api tests/qemu
 SUBDIRS += tests/protocol tests/lvm tests/luks tests/md
 SUBDIRS += tests/regressions
-SUBDIRS += extratests test-tool
+SUBDIRS += tests/extra test-tool
 
 # Guestfish.
 SUBDIRS += fish
@@ -253,10 +253,10 @@ CLEANFILES = \
 quickcheck:
 	./run test-tool/libguestfs-test-tool $(QUICKCHECK_TEST_TOOL_ARGS)
 
-# Run extra-tests in extratests/ subdirectory.
+# Run extra-tests in tests/extra/ subdirectory.
 
 extra-tests:
-	make -C extratests $@
+	make -C tests/extra $@
 
 # Make binary distribution.
 
diff --git a/configure.ac b/configure.ac
index 33d2aea1..6084a1b4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1016,7 +1016,6 @@ AC_CONFIG_FILES([Makefile
                  erlang/Makefile
                  erlang/examples/Makefile
                  examples/Makefile
-                 extratests/Makefile
                  fish/Makefile
                  fuse/Makefile
                  generator/Makefile
@@ -1050,6 +1049,7 @@ AC_CONFIG_FILES([Makefile
                  src/Makefile
                  test-tool/Makefile
                  tests/c-api/Makefile
+                 tests/extra/Makefile
                  tests/luks/Makefile
                  tests/lvm/Makefile
                  tests/md/Makefile
diff --git a/src/guestfs.pod b/src/guestfs.pod
index 85760659..3bad6e63 100644
--- a/src/guestfs.pod
+++ b/src/guestfs.pod
@@ -2949,11 +2949,6 @@ L<virt-edit(1)> command and documentation.
 
 C API example code.
 
-=item C<extratests>
-
-Extra tests.  These are not run by default because they require
-special tools or configuration.
-
 =item C<fish>
 
 L<guestfish(1)>, the command-line shell, and various shell scripts
diff --git a/extratests/Makefile.am b/tests/extra/Makefile.am
index 0b4e20ea..7d1cc22e 100644
--- a/extratests/Makefile.am
+++ b/tests/extra/Makefile.am
@@ -92,68 +92,68 @@ test-prerequisites:
 
 # Null invocations of the basic tools shouldn't leak memory.
 test-tools-null:
-	$(RUN_VG) ../fish/guestfish -N part exit
-	$(RUN_VG) ../align/virt-alignment-scan -a test1.img >/dev/null
+	$(RUN_VG) ../../fish/guestfish -N part exit
+	$(RUN_VG) ../../align/virt-alignment-scan -a test1.img >/dev/null
 	rm test1.img
-	$(RUN_VG) ../cat/virt-filesystems -a /dev/null >/dev/null
-	$(RUN_VG) ../cat/virt-filesystems -a /dev/null --all --long -h --uuid >/dev/null
-	$(RUN_VG) ../df/virt-df -a /dev/null >/dev/null
-	$(RUN_VG) ../fish/guestfish -a /dev/null run
-	$(RUN_VG) ../inspector/virt-inspector -a /dev/null >/dev/null
-	$(RUN_VG) ../test-tool/libguestfs-test-tool >/dev/null 2>&1
+	$(RUN_VG) ../../cat/virt-filesystems -a /dev/null >/dev/null
+	$(RUN_VG) ../../cat/virt-filesystems -a /dev/null --all --long -h --uuid >/dev/null
+	$(RUN_VG) ../../df/virt-df -a /dev/null >/dev/null
+	$(RUN_VG) ../../fish/guestfish -a /dev/null run
+	$(RUN_VG) ../../inspector/virt-inspector -a /dev/null >/dev/null
+	$(RUN_VG) ../../test-tool/libguestfs-test-tool >/dev/null 2>&1
 
 # 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 ../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
 
 # Invocations of tools on real images shouldn't leak memory.
 test-df-real:
-	$(RUN_VG) virt-df >/dev/null
-	$(RUN_VG) virt-df -h >/dev/null
+	$(RUN_VG) ../../df/virt-df >/dev/null
+	$(RUN_VG) ../../df/virt-df -h >/dev/null
 
 test-filesystems-real:
 	@for g in $(GUESTS); do \
-	  echo $(RUN_VG) ../cat/virt-filesystems -d $$g --all --long -h --uuid; \
-	  $(RUN_VG) ../cat/virt-filesystems -d $$g --all --long -h --uuid > /dev/null; \
+	  echo $(RUN_VG) ../../cat/virt-filesystems -d $$g --all --long -h --uuid; \
+	  $(RUN_VG) ../../cat/virt-filesystems -d $$g --all --long -h --uuid > /dev/null; \
 	  r=$$?; \
 	  if [ $$r -ne 0 ]; then exit $$r; fi; \
 	done
 
 test-inspector-real:
 	@for g in $(GUESTS); do \
-	  echo $(RUN_VG) ../inspector/virt-inspector -d $$g; \
-	  $(RUN_VG) ../inspector/virt-inspector -d $$g > /dev/null; \
+	  echo $(RUN_VG) ../../inspector/virt-inspector -d $$g; \
+	  $(RUN_VG) ../../inspector/virt-inspector -d $$g > /dev/null; \
 	  r=$$?; \
 	  if [ $$r -ne 0 ]; then exit $$r; fi; \
 	done
 
 # Run virt-resize tests under valgrind.
 test-resize:
-	$(MAKE) -C ../resize VG="$(VG)" check
+	$(MAKE) -C ../../resize VG="$(VG)" check
 
 # Run virt-sparsify tests under valgrind.
 test-sparsify:
-	$(MAKE) -C ../sparsify VG="$(VG)" check
+	$(MAKE) -C ../../sparsify VG="$(VG)" check
 
 # Run c-api tests under valgrind.
 test-c-api:
-	$(MAKE) -C ../tests/c-api VG="$(RUN_VG)" check
+	$(MAKE) -C ../c-api VG="$(RUN_VG)" check
 
 # Test OCaml bindings under valgrind.
 test-ocaml:
-	$(MAKE) -C ../ocaml VG="$(VG)" check
+	$(MAKE) -C ../../ocaml VG="$(VG)" check
diff --git a/extratests/suppressions b/tests/extra/suppressions
index 4dc02d2f..4dc02d2f 100644
--- a/extratests/suppressions
+++ b/tests/extra/suppressions