git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fish: Improve error messages when no OS / multi-boot OS found with inspection (RHBZ...
[libguestfs.git]
/
capitests
/
Makefile.am
diff --git
a/capitests/Makefile.am
b/capitests/Makefile.am
index
487a33f
..
d32b7fc
100644
(file)
--- a/
capitests/Makefile.am
+++ b/
capitests/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
@@
-32,6
+32,7
@@
check_PROGRAMS = \
test-add-drive-opts \
test-last-errno \
test-private-data \
test-add-drive-opts \
test-last-errno \
test-private-data \
+ test-user-cancel \
test-debug-to-file
TESTS = \
test-debug-to-file
TESTS = \
@@
-42,6
+43,7
@@
TESTS = \
test-add-drive-opts \
test-last-errno \
test-private-data \
test-add-drive-opts \
test-last-errno \
test-private-data \
+ test-user-cancel \
test-debug-to-file
# The API behind this test is not baked yet.
test-debug-to-file
# The API behind this test is not baked yet.
@@
-55,6
+57,7
@@
TESTS_ENVIRONMENT = \
SKIP_TEST_COMMAND=$(shell ldd test-command | grep -sq 'not a dynamic executable' || echo 1) \
SKIP_TEST_COMMAND_LINES=$(shell ldd test-command | grep -sq 'not a dynamic executable' || echo 1) \
LIBGUESTFS_PATH=$(top_builddir)/appliance \
SKIP_TEST_COMMAND=$(shell ldd test-command | grep -sq 'not a dynamic executable' || echo 1) \
SKIP_TEST_COMMAND_LINES=$(shell ldd test-command | grep -sq 'not a dynamic executable' || echo 1) \
LIBGUESTFS_PATH=$(top_builddir)/appliance \
+ TMPDIR=$(top_builddir) \
$(VG)
#SKIP_TEST_CHECKSUM_8=$(shell if test `find ../initramfs -name squashfs.ko | wc -l` -eq 0; then echo 1; fi)
$(VG)
#SKIP_TEST_CHECKSUM_8=$(shell if test `find ../initramfs -name squashfs.ko | wc -l` -eq 0; then echo 1; fi)
@@
-114,10
+117,19
@@
test_private_data_CFLAGS = \
test_private_data_LDADD = \
$(top_builddir)/src/libguestfs.la
test_private_data_LDADD = \
$(top_builddir)/src/libguestfs.la
+test_user_cancel_SOURCES = test-user-cancel.c
+test_user_cancel_CFLAGS = \
+ -pthread \
+ -I$(top_srcdir)/src -I$(top_builddir)/src \
+ $(WARN_CFLAGS) $(WERROR_CFLAGS)
+test_user_cancel_LDADD = \
+ $(top_builddir)/src/libguestfs.la -lm
+
test_debug_to_file_SOURCES = test-debug-to-file.c
test_debug_to_file_CFLAGS = \
-I$(top_srcdir)/src -I$(top_builddir)/src \
-I$(top_srcdir)/gnulib/lib \
test_debug_to_file_SOURCES = test-debug-to-file.c
test_debug_to_file_CFLAGS = \
-I$(top_srcdir)/src -I$(top_builddir)/src \
-I$(top_srcdir)/gnulib/lib \
+ -I$(top_builddir)/gnulib/lib \
$(WARN_CFLAGS) $(WERROR_CFLAGS)
test_debug_to_file_LDADD = \
$(top_builddir)/src/libguestfs.la \
$(WARN_CFLAGS) $(WERROR_CFLAGS)
test_debug_to_file_LDADD = \
$(top_builddir)/src/libguestfs.la \