git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tests: Put test-tool and comment into own section.
[libguestfs.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index
a223600
..
725d12c
100644
(file)
--- 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.
ACLOCAL_AMFLAGS = -I m4
# Basic source for the library.
-SUBDIRS = gnulib/lib
image
s generator src examples po
+SUBDIRS = gnulib/lib
tests/data tests/guest
s generator src examples po
if ENABLE_DAEMON
SUBDIRS += daemon
if ENABLE_DAEMON
SUBDIRS += daemon
@@
-29,8
+29,14
@@
if ENABLE_APPLIANCE
SUBDIRS += appliance
endif
SUBDIRS += appliance
endif
-# Tests and the test-tool.
-SUBDIRS += gnulib/tests capitests caution regressions test-tool
+# Tests.
+SUBDIRS += gnulib/tests tests/c-api tests/qemu
+SUBDIRS += tests/protocol tests/lvm tests/luks tests/md
+SUBDIRS += tests/regressions
+SUBDIRS += tests/extra
+
+# libguestfs-test-tool
+SUBDIRS += test-tool
# Guestfish.
SUBDIRS += fish
# Guestfish.
SUBDIRS += fish
@@
-218,7
+224,7
@@
all-local:
find $(DIST_SUBDIRS) \
-name '*.c' -o -name '*.pl' -o -name '*.pm' | \
grep -v '^perl/blib/' | \
find $(DIST_SUBDIRS) \
-name '*.c' -o -name '*.pl' -o -name '*.pm' | \
grep -v '^perl/blib/' | \
- grep -v '^
capi
tests/' | \
+ grep -v '^tests/' | \
grep -v '^daemon/lib/' | \
grep -v '^daemon/tests/' | \
grep -v '^examples/' | \
grep -v '^daemon/lib/' | \
grep -v '^daemon/tests/' | \
grep -v '^examples/' | \
@@
-228,6
+234,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
@@
-249,6
+256,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 tests/extra/ subdirectory.
+
+extra-tests:
+ make -C tests/extra $@
+
# Make binary distribution.
BINTMPDIR = /tmp/libguestfs-bin
# Make binary distribution.
BINTMPDIR = /tmp/libguestfs-bin