search for: test_oldstyle_ldadd

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

..._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 = $(WARNINGS_CFLAGS) $(LIBGUESTFS_CFLAGS) test_oldstyle_LDADD = libtest.la $(LIBGUESTFS_LIBS) -# PKI files for the TLS tests. -check_DATA += pki/.stamp -pki/.stamp: make-pki.sh - ./make-pki.sh - # file plugin test. check_PROGRAMS += test-file TESTS += test-file -- 2.13.6

...rn r; + if (next_ops->extents (nxdata, count, offset, flags, extents, err) == -1) + return -1; return cacheextents_fill (extents, err); } diff --git a/tests/Makefile.am b/tests/Makefile.am index a2bbaea..aaf7450 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -366,9 +366,7 @@ test_oldstyle_LDADD = libtest.la $(LIBGUESTFS_LIBS) endif HAVE_LIBGUESTFS # Test export flags. -TESTS += \ - test-cacheextents.sh \ - test-eflags.sh +TESTS += test-eflags.sh # common disk image shared with several tests if HAVE_GUESTFISH @@ -868,6 +866,9 @@ TESTS += \ endif HAVE_GUESTFISH TESTS += test-cache...

...nxdata, count, offset, flags, extents, err) == -1) >+ return -1; > > return cacheextents_fill (extents, err); > } >diff --git a/tests/Makefile.am b/tests/Makefile.am >index a2bbaea..aaf7450 100644 >--- a/tests/Makefile.am >+++ b/tests/Makefile.am >@@ -366,9 +366,7 @@ test_oldstyle_LDADD = libtest.la $(LIBGUESTFS_LIBS) > endif HAVE_LIBGUESTFS > > # Test export flags. >-TESTS += \ >- test-cacheextents.sh \ >- test-eflags.sh >+TESTS += test-eflags.sh > > # common disk image shared with several tests > if HAVE_GUESTFISH >@@ -868,6 +866,9 @@ TESTS += \...

CentOS 6 has libguestfs-devel 1.20.11, which predates the support in guestfs_add_drive_opts() for requesting an nbd drive instead of a local file (annoyingly, guestfs documentation merely states the function was available since 0.3, without saying which later releases added new options); causing a compilation failure during 'make check'. Maybe the guestfs plugin should still be built,

--- tests/Makefile.am | 3 + tests/test-eflags.sh | 222 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 225 insertions(+) diff --git a/tests/Makefile.am b/tests/Makefile.am index a01c47c..173d622 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -282,6 +282,9 @@ test_oldstyle_LDADD = libtest.la $(LIBGUESTFS_LIBS) endif HAVE_LIBGUESTFS +# Test export flags. +TESTS += test-eflags.sh + # common disk image shared with several tests if HAVE_GUESTFISH check_DATA += disk diff --git a/tests/test-eflags.sh b/tests/test-eflags.sh new file mode 100755 index 0000000..96ec311 ---...

...akefile.am index 4148793c7297..a2bbaeac5d45 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -47,6 +47,7 @@ EXTRA_DIST = \ test-cache.sh \ test-cache-max-size.sh \ test-cache-on-read.sh \ + test-cacheextents.sh \ test-captive.sh \ test-cow.sh \ test-cxx.sh \ @@ -365,7 +366,9 @@ test_oldstyle_LDADD = libtest.la $(LIBGUESTFS_LIBS) endif HAVE_LIBGUESTFS # Test export flags. -TESTS += test-eflags.sh +TESTS += \ + test-cacheextents.sh \ + test-eflags.sh # common disk image shared with several tests if HAVE_GUESTFISH diff --git a/tests/test-cacheextents.sh b/tests/test-cacheextents.sh new...

...STFS_CFLAGS) test_newstyle_LDADD = libtest.la $(LIBGUESTFS_LIBS) # oldstyle protocol test. -check_PROGRAMS += test-oldstyle -TESTS += test-oldstyle +LIBGUESTFS_TESTS += test-oldstyle test_oldstyle_SOURCES = test-oldstyle.c test.h test_oldstyle_CFLAGS = $(WARNINGS_CFLAGS) $(LIBGUESTFS_CFLAGS) test_oldstyle_LDADD = libtest.la $(LIBGUESTFS_LIBS) +endif HAVE_LIBGUESTFS + # file plugin test. -check_PROGRAMS += test-file -TESTS += test-file +LIBGUESTFS_TESTS += test-file test_file_SOURCES = test-file.c test.h test_file_CFLAGS = $(WARNINGS_CFLAGS) $(LIBGUESTFS_CFLAGS) @@ -241,8 +243,7 @@ test_file_LDADD = l...

v1 was here: https://www.redhat.com/archives/libguestfs/2018-December/thread.html#00123 v2: - Document "-" instead of "script=-" and use it in the test; and verify this also works on FreeBSD; and verify that it doesn't depend on the particular behaviour of our wrapper script and should work with installed nbdkit too. - Fix handling of zero flags parameter. -

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

Some feature additions to the shell script plugin allow us to test the export flags field reasonably easily. Rich.

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