git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
extra tests: Split up and reorder tests more logically.
[libguestfs.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index
c7166b7
..
b034b29
100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-13,7
+13,7
@@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
#
# 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.,
675 Mass Ave, Cambridge, MA 02139,
USA.
+# Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
USA.
include $(top_srcdir)/subdir-rules.mk
include $(top_srcdir)/subdir-rules.mk
@@
-30,13
+30,13
@@
SUBDIRS += appliance
endif
# Tests and the test-tool.
endif
# Tests and the test-tool.
-SUBDIRS += gnulib/tests capitests caution regressions test-tool
+SUBDIRS += gnulib/tests capitests caution regressions
extratests
test-tool
# Guestfish.
SUBDIRS += fish
# virt-tools in C.
# Guestfish.
SUBDIRS += fish
# virt-tools in C.
-SUBDIRS += cat df edit inspector rescue
+SUBDIRS +=
align
cat df edit inspector rescue
# Language bindings.
if HAVE_PERL
# Language bindings.
if HAVE_PERL
@@
-67,22
+67,26
@@
endif
# Unconditional because nothing is built yet.
SUBDIRS += csharp
# Unconditional because nothing is built yet.
SUBDIRS += csharp
-# virt-resize
2.0 is
written in OCaml.
+# virt-resize
(new version) and virt-sparsify are
written in OCaml.
if HAVE_OCAML
if HAVE_OCAML
-if HAVE_OCAML_PCRE
-SUBDIRS += resize
-endif
+SUBDIRS += resize sparsify
endif
endif
-# Perl tools
and guestmount
.
+# Perl tools.
if HAVE_TOOLS
SUBDIRS += tools
endif
if HAVE_TOOLS
SUBDIRS += tools
endif
+# guestmount
if HAVE_FUSE
SUBDIRS += fuse
endif
if HAVE_FUSE
SUBDIRS += fuse
endif
+# virt-tools in shell. This uses guestmount and virt-inspector.
+if HAVE_FUSE
+SUBDIRS += clone
+endif
+
# po-docs must come after tools, inspector.
if HAVE_PO4A
SUBDIRS += po-docs
# po-docs must come after tools, inspector.
if HAVE_PO4A
SUBDIRS += po-docs
@@
-141,8
+145,10
@@
HTMLFILES = \
html/guestfs-python.3.html \
html/guestfs-recipes.1.html \
html/guestfs-ruby.3.html \
html/guestfs-python.3.html \
html/guestfs-recipes.1.html \
html/guestfs-ruby.3.html \
+ html/guestfs-testing.1.html \
html/guestfish.1.html \
html/guestmount.1.html \
html/guestfish.1.html \
html/guestmount.1.html \
+ html/virt-alignment-scan.1.html \
html/virt-cat.1.html \
html/virt-copy-in.1.html \
html/virt-copy-out.1.html \
html/virt-cat.1.html \
html/virt-copy-in.1.html \
html/virt-copy-out.1.html \
@@
-156,6
+162,8
@@
HTMLFILES = \
html/virt-make-fs.1.html \
html/virt-rescue.1.html \
html/virt-resize.1.html \
html/virt-make-fs.1.html \
html/virt-rescue.1.html \
html/virt-resize.1.html \
+ html/virt-sparsify.1.html \
+ html/virt-sysprep.1.html \
html/virt-tar.1.html \
html/virt-tar-in.1.html \
html/virt-tar-out.1.html \
html/virt-tar.1.html \
html/virt-tar-in.1.html \
html/virt-tar-out.1.html \
@@
-204,6
+212,7
@@
all-local:
grep -v '/rc_protocol.c' | \
grep -v 'appliance/debian/root' | \
grep -v '^po-docs/' | \
grep -v '/rc_protocol.c' | \
grep -v 'appliance/debian/root' | \
grep -v '^po-docs/' | \
+ grep -v '^images/' | \
LC_ALL=C sort | \
sed 's,^\./,,' > po/POTFILES.in
LC_ALL=C sort | \
sed 's,^\./,,' > po/POTFILES.in
@@
-225,6
+234,11
@@
CLEANFILES = \
quickcheck:
./run test-tool/libguestfs-test-tool $(QUICKCHECK_TEST_TOOL_ARGS)
quickcheck:
./run test-tool/libguestfs-test-tool $(QUICKCHECK_TEST_TOOL_ARGS)
+# Run extra-tests in extratests/ subdirectory.
+
+extra-tests:
+ make -C extratests $@
+
# Make binary distribution.
BINTMPDIR = /tmp/libguestfs-bin
# Make binary distribution.
BINTMPDIR = /tmp/libguestfs-bin