search for: libguestfs_cflag

...1ac..3b4172d 100644 --- a/mltools/Makefile.am +++ b/mltools/Makefile.am @@ -103,7 +103,9 @@ libmltools_a_CPPFLAGS = \ -I$(top_srcdir)/common/mlutils libmltools_a_CFLAGS = \ $(WARN_CFLAGS) $(WERROR_CFLAGS) \ - $(LIBVIRT_CFLAGS) $(LIBXML2_CFLAGS) \ + $(LIBVIRT_CFLAGS) \ + $(LIBXML2_CFLAGS) \ + $(LIBGUESTFS_CFLAGS) \ $(JANSSON_CFLAGS) \ -fPIC diff --git a/mlutils/Makefile.am b/mlutils/Makefile.am index e86d7bb..38a683f 100644 --- a/mlutils/Makefile.am +++ b/mlutils/Makefile.am @@ -63,7 +63,8 @@ libmlcutils_a_CPPFLAGS = \ -I$(shell $(OCAMLC) -where) libmlcutils_a_CFLAGS = \ $(WARN_CFLAGS) $(WERROR...

...UESTFS], [libguestfs],[ + # Although the library was found, we want to make sure it supports nbd + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ +#include <guestfs.h> + ]], [[ +#ifndef GUESTFS_ADD_DRIVE_OPTS_PROTOCOL +#error unsupported +#endif + ]])], [ AC_SUBST([LIBGUESTFS_CFLAGS]) AC_SUBST([LIBGUESTFS_LIBS]) AC_DEFINE([HAVE_LIBGUESTFS],[1],[libguestfs found at compile time.]) + ],[ + LIBGUESTFS_LIBS= + AC_MSG_WARN([libguestfs too old, guestfs plugin and tests will be disabled])]) ], [AC_MSG_WARN([libguestfs not found, guest...

...206,32 +210,30 @@ libtest_la_SOURCES = test.c test.h libtest_la_CFLAGS = $(WARNINGS_CFLAGS) # Basic connection test. -check_PROGRAMS += test-connect -TESTS += test-connect +LIBGUESTFS_TESTS += test-connect test_connect_SOURCES = test-connect.c test.h test_connect_CFLAGS = $(WARNINGS_CFLAGS) $(LIBGUESTFS_CFLAGS) test_connect_LDADD = libtest.la $(LIBGUESTFS_LIBS) # newstyle protocol test. -check_PROGRAMS += test-newstyle -TESTS += test-newstyle +LIBGUESTFS_TESTS += test-newstyle test_newstyle_SOURCES = test-newstyle.c test.h test_newstyle_CFLAGS = $(WARNINGS_CFLAGS) $(LIBGUESTFS_CFLAGS) test_newsty...

...efile.am | 2 ++ 1 file changed, 2 insertions(+) diff --git a/v2v/Makefile.am b/v2v/Makefile.am index 2a196d45d..104420d13 100644 --- a/v2v/Makefile.am +++ b/v2v/Makefile.am @@ -197,6 +197,7 @@ virt_v2v_CPPFLAGS = \ -I$(top_srcdir)/lib virt_v2v_CFLAGS = \ $(WARN_CFLAGS) $(WERROR_CFLAGS) \ + $(LIBGUESTFS_CFLAGS) \ $(LIBVIRT_CFLAGS) \ $(LIBOSINFO_CFLAGS) @@ -230,6 +231,7 @@ endif OCAMLCLIBS = \ -lqemuopts \ + $(LIBGUESTFS_LIBS) \ $(LIBVIRT_LIBS) \ $(LIBXML2_LIBS) \ $(JANSSON_LIBS) \ -- 2.24.1

...gt; > diff --git a/v2v/Makefile.am b/v2v/Makefile.am > index 2a196d45d..104420d13 100644 > --- a/v2v/Makefile.am > +++ b/v2v/Makefile.am > @@ -197,6 +197,7 @@ virt_v2v_CPPFLAGS = \ > -I$(top_srcdir)/lib > virt_v2v_CFLAGS = \ > $(WARN_CFLAGS) $(WERROR_CFLAGS) \ > + $(LIBGUESTFS_CFLAGS) \ > $(LIBVIRT_CFLAGS) \ > $(LIBOSINFO_CFLAGS) > > @@ -230,6 +231,7 @@ endif > > OCAMLCLIBS = \ > -lqemuopts \ > + $(LIBGUESTFS_LIBS) \ > $(LIBVIRT_LIBS) \ > $(LIBXML2_LIBS) \ > $(JANSSON_LIBS) \ LGTM. Thanks, -- Pino Toscano

Hi, few miscellaneous fixes for nbdkit. Thanks, Pino Toscano (3): build: use AC_MSG_RESULT for $PERL_LDOPTS crypto: add missing '{' tests: fix generation of PKI test data configure.ac | 1 + src/crypto.c | 2 +- tests/Makefile.am | 10 +++++----- 3 files changed, 7 insertions(+), 6 deletions(-) -- 2.13.6

...diff --git a/tests/Makefile.am b/tests/Makefile.am index 9a42964..f2775bd 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -133,6 +133,11 @@ TESTS += test-exit-with-parent test_exit_with_parent_SOURCES = test-exit-with-parent.c test.h test_exit_with_parent_CFLAGS = $(WARNINGS_CFLAGS) $(LIBGUESTFS_CFLAGS) +# PKI files for the TLS tests. +check_DATA += pki/.stamp +pki/.stamp: $(srcdir)/make-pki.sh + $(srcdir)/make-pki.sh + # In-depth tests need libguestfs, since that is a convenient way to # drive qemu. @@ -177,11 +182,6 @@ test_oldstyle_SOURCES = test-oldstyle.c test.h test_oldstyle_CFLAGS...

...+= ext2.img +CLEANFILES += ext2.img ext2.img: disk rm -f $@ $@-t @@ -385,7 +387,7 @@ if HAVE_GUESTFISH LIBGUESTFS_TESTS += test-gzip check_DATA += disk.gz -MAINTAINERCLEANFILES += disk.gz +CLEANFILES += disk.gz test_gzip_SOURCES = test-gzip.c test.h test_gzip_CFLAGS = $(WARNINGS_CFLAGS) $(LIBGUESTFS_CFLAGS) @@ -454,7 +456,7 @@ test_random_LDADD = libtest.la $(LIBGUESTFS_LIBS) # split files plugin test. check_DATA += split1 split2 split3 -MAINTAINERCLEANFILES += split1 split2 split3 +CLEANFILES += split1 split2 split3 split1: file-data rm -f $@ $@-t dd if=$< of=$@-t bs=1 count=100 @@ -528,...

In libguestfs we have a few tests that require root privileges and they are skipped by default (normally you should not build or test as root), but you can do this to run them: sudo make check-root In nbdkit I wanted to check that the file plugin works with block devices (this is not tested), and the only way I can sensibly think to do this is using a loopback device and root. This commit

To avoid bitrot, any new feature needs testsuite coverage ;) Still to come: once I get my work on parallel nbd finished, I will add a test-parallel-nbd.sh that closely mirrors what my other series added in test-parallel-file.sh. If desired, it might be a fun exercise to tweak test-nbd into using a for-loop of user-controlled depth for how deep you want to nest the forwarding tree, to see where

I've posted some of these patches or ideas before; but now I'm confident enough with the series that it should be ready to push; at any rate, I can now run test-socket-activation in a tight loop without triggering any crashes or hangs. With this in place, I'm going back to work on making the nbd forwarder wort with the parallel thread model. Eric Blake (8): sockets: Use

...r-qemu.sh \ + test-nbd-extents.sh \ test-nozero.sh \ test-null-extents.sh \ test_ocaml_plugin.ml \ @@ -530,6 +531,8 @@ TESTS += \ # nbd plugin test. LIBGUESTFS_TESTS += test-nbd +TESTS += \ + test-nbd-extents.sh test_nbd_SOURCES = test-nbd.c test.h test_nbd_CFLAGS = $(WARNINGS_CFLAGS) $(LIBGUESTFS_CFLAGS) diff --git a/tests/test-nbd-extents.sh b/tests/test-nbd-extents.sh new file mode 100755 index 0000000..76f4f47 --- /dev/null +++ b/tests/test-nbd-extents.sh @@ -0,0 +1,113 @@ +#!/usr/bin/env bash +# nbdkit +# Copyright (C) 2019 Red Hat Inc. +# +# Redistribution and use in source and binary forms,...

...e.am @@ -64,6 +64,7 @@ EXTRA_DIST = \ test-error0.sh \ test-error10.sh \ test-error100.sh \ + test-file-extents.sh \ test-floppy.sh \ test-foreground.sh \ test-fua.sh \ @@ -419,6 +420,10 @@ test_file_block_SOURCES = test-file-block.c test.h test_file_block_CFLAGS = $(WARNINGS_CFLAGS) $(LIBGUESTFS_CFLAGS) test_file_block_LDADD = libtest.la $(LIBGUESTFS_LIBS) +if HAVE_GUESTFISH +TESTS += test-file-extents.sh +endif HAVE_GUESTFISH + # floppy plugin test. if HAVE_GUESTFISH TESTS += test-floppy.sh diff --git a/tests/test-file-extents.sh b/tests/test-file-extents.sh new file mode 100755 index 000...

...st-reflection-address.sh \ test-reflection-base64.sh \ test-reflection-raw.sh \ + test-retry.sh \ + test-retry-reopen-fail.sh \ test-shutdown.sh \ test-ssh.sh \ test.tcl \ @@ -1040,6 +1042,12 @@ test_readahead_SOURCES = test-readahead.c test.h test_readahead_CFLAGS = $(WARNINGS_CFLAGS) $(LIBGUESTFS_CFLAGS) test_readahead_LDADD = libtest.la $(LIBGUESTFS_LIBS) +# retry filter test. +TESTS += \ + test-retry.sh \ + test-retry-reopen-fail.sh \ + $(NULL) + # truncate filter tests. TESTS += \ test-truncate1.sh \ diff --git a/tests/test-retry-reopen-fail.sh b/tests/test-retry-reopen-fail.sh new file...

...itioning2.sh \ test-partitioning3.sh \ @@ -792,11 +793,7 @@ test_offset_LDADD = libtest.la $(LIBGUESTFS_LIBS) TESTS += test-offset2.sh # partition filter test. -LIBGUESTFS_TESTS += test-partition - -test_partition_SOURCES = test-partition.c test.h -test_partition_CFLAGS = $(WARNINGS_CFLAGS) $(LIBGUESTFS_CFLAGS) -test_partition_LDADD = libtest.la $(LIBGUESTFS_LIBS) +TESTS += test-partition.sh # truncate filter tests. TESTS += \ diff --git a/tests/test-partition.sh b/tests/test-partition.sh new file mode 100755 index 0000000..a9b2bdf --- /dev/null +++ b/tests/test-partition.sh @@ -0,0 +1,148 @@ +#!/us...

...itioning2.sh \ test-partitioning3.sh \ @@ -794,11 +795,7 @@ test_offset_LDADD = libtest.la $(LIBGUESTFS_LIBS) TESTS += test-offset2.sh # partition filter test. -LIBGUESTFS_TESTS += test-partition - -test_partition_SOURCES = test-partition.c test.h -test_partition_CFLAGS = $(WARNINGS_CFLAGS) $(LIBGUESTFS_CFLAGS) -test_partition_LDADD = libtest.la $(LIBGUESTFS_LIBS) +TESTS += test-partition1.sh # truncate filter tests. TESTS += \ diff --git a/tests/test-partition1.sh b/tests/test-partition1.sh new file mode 100755 index 0000000..3884446 --- /dev/null +++ b/tests/test-partition1.sh @@ -0,0 +1,165 @@ +#...

There is a small test provided. I tested this a lot more locally and it seems pretty robust. Rich.

...EXTRA_DIST += test-floppy.sh TESTS += test-full.sh EXTRA_DIST += test-full.sh -# gzip plugin test. -if HAVE_MKE2FS_WITH_D -if HAVE_ZLIB -LIBGUESTFS_TESTS += test-gzip -check_DATA += disk.gz -CLEANFILES += disk.gz - -test_gzip_SOURCES = test-gzip.c test.h -test_gzip_CFLAGS = $(WARNINGS_CFLAGS) $(LIBGUESTFS_CFLAGS) -test_gzip_LDADD = libtest.la $(LIBGUESTFS_LIBS) - -disk.gz: disk - rm -f $@ - gzip -9 -c disk > $@ -endif HAVE_ZLIB -endif HAVE_MKE2FS_WITH_D - # info plugin test. TESTS += \ test-info-address.sh \ @@ -1253,6 +1236,23 @@ EXTRA_DIST += test-extentlist.sh TESTS += test-fua.sh EXTRA_DIST +...

...a / : \ mkdir /disks : \ - upload $< /disks/disk.img + upload $< /disks/disk.img : \ + upload manifest /manifest + rm manifest mv $@-t $@ +if HAVE_GUESTFISH + +LIBGUESTFS_TESTS += test-ext2 + test_ext2_SOURCES = test-ext2.c test.h test_ext2_CFLAGS = $(WARNINGS_CFLAGS) $(LIBGUESTFS_CFLAGS) test_ext2_LDADD = libtest.la $(LIBGUESTFS_LIBS) diff --git a/filters/ext2/ext2.c b/filters/ext2/ext2.c index 7ad4a005..cfc03a3c 100644 --- a/filters/ext2/ext2.c +++ b/filters/ext2/ext2.c @@ -50,8 +50,10 @@ #include "cleanup.h" #include "io.h" -/* Filename parameter, or NUL...

...@ EXTRA_DIST = \ test-random-sock.sh \ test-tls.sh \ test-tls-psk.sh \ + test-truncate1.sh \ + test-truncate2.sh \ test-vddk.sh \ test-version.sh \ test-version-filter.sh \ @@ -571,4 +573,9 @@ test_partition_SOURCES = test-partition.c test.h test_partition_CFLAGS = $(WARNINGS_CFLAGS) $(LIBGUESTFS_CFLAGS) test_partition_LDADD = libtest.la $(LIBGUESTFS_LIBS) +# truncate filter tests. +TESTS += \ + test-truncate1.sh \ + test-truncate2.sh + endif HAVE_PLUGINS diff --git a/tests/test-truncate1.sh b/tests/test-truncate1.sh new file mode 100755 index 0000000..61d2a50 --- /dev/null +++ b/tests/test-t...