search for: have_guestfish

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,

...4: kill: (32161) - No such process FAIL: test-cache.sh guestfish: -N parameter 'cow-base.img=fs': no such prepared disk image known. Use 'guestfish -N help' to list possible values for the -N parameter. FAIL: test-cow.sh (hmm, so my attempt to guard test-cache.sh and test-cow.sh by HAVE_GUESTFISH didn't really help) tests/Makefile.am | 71 +++++++++++++++++++++++++------------------------------ 1 file changed, 32 insertions(+), 39 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index 2cc2344..4582120 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -190,7 +19...

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

...--- 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-max-size.sh +# cacheextents filter test. +TESTS += test-cacheextents.sh + # cow filter test. if HAVE_GUESTFISH TESTS += test-cow.sh diff --git a/tests/test-cacheextents.sh b/tests/test-cacheextents.sh index fd0bd1c..b914...

...ck_DATA += file-data -MAINTAINERCLEANFILES += file-data +CLEANFILES += file-data file-data: rm -f $@ $@-t for f in `$(SEQ) 1 512`; do echo -ne '\x01\x02\x03\x04\x05\x06\x07\x08'; done > $@-t @@ -286,7 +288,7 @@ endif HAVE_LIBGUESTFS # common disk image shared with several tests if HAVE_GUESTFISH check_DATA += disk -MAINTAINERCLEANFILES += disk +CLEANFILES += disk disk: rm -f $@ test1.img @@ -340,7 +342,7 @@ if HAVE_GUESTFISH LIBGUESTFS_TESTS += test-ext2 check_DATA += ext2.img -MAINTAINERCLEANFILES += ext2.img +CLEANFILES += ext2.img ext2.img: disk rm -f $@ $@-t @@ -385,7 +387,...

...ile.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-max-size.sh > >+# cacheextents filter test. >+TESTS += test-cacheextents.sh >+ > # cow filter test. > if HAVE_GUESTFISH > TESTS += test-cow.sh >diff --git a/tests/test-cacheextents.sh b/tes...

...o, give the > > fake disk a less generic file name. > > The fix is fine but this description is wrong. > > The actual problem is you don't have guestfish installed, which is > required to build ‘disk’. However ‘test-single.sh’ is outside the > automake conditional for HAVE_GUESTFISH, so the test can run without > ‘disk’ having been created. Yes, I discovered that right after sending the patch. > ACK, but with the description fixed to reflect what's really going on. What about the following commit message: "tests: test-single: use an own fake disk Instead of...

Make sure the fake disk exist, otherwise nbdkit fails. Also, give the fake disk a less generic file name. --- tests/test-single.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/test-single.sh b/tests/test-single.sh index d60538d..9dc462b 100755 --- a/tests/test-single.sh +++ b/tests/test-single.sh @@ -45,11 +45,13 @@ if ! qemu-img --help >/dev/null; then

...est-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 0000000..1f33c88 --- /dev/null +++ b/tests/test-file-extents.sh @@ -0,0 +1,57 @@...

...est-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 file mode 100755 index 000000000000..fd0bd1c1bc48 --- /dev/null +++ b/tests/test-cacheextents.sh @@ -0,0 +1,56 @@ +#!/usr/bin/env bash +# nbdkit +# Copyright (C) 2019 Red Hat Inc. +# +# Redistribution and use in source and bin...

...54597b..9eec75e 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -50,6 +50,7 @@ EXTRA_DIST = \ test-cacheextents.sh \ test-captive.sh \ test-cow.sh \ + test-cow-null.sh \ test-cxx.sh \ test-data-7E.sh \ test-data-base64.sh \ @@ -960,6 +961,7 @@ TESTS += test-cacheextents.sh if HAVE_GUESTFISH TESTS += test-cow.sh endif HAVE_GUESTFISH +TESTS += test-cow-null.sh # delay filter tests. TESTS += test-shutdown.sh diff --git a/tests/test-cow-null.sh b/tests/test-cow-null.sh new file mode 100755 index 0000000..fd6c04f --- /dev/null +++ b/tests/test-cow-null.sh @@ -0,0 +1,42 @@ +#!/usr/bin...

...ck, BLKSIZE, offset) == -1) { *err = errno; nbdkit_error ("pread: %m"); diff --git a/tests/Makefile.am b/tests/Makefile.am index 79b723a..ccd5ff5 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -702,7 +702,9 @@ TESTS += test-blocksize.sh # cache filter test. if HAVE_GUESTFISH -TESTS += test-cache.sh +TESTS += \ + test-cache.sh \ + test-cache-on-read.sh endif HAVE_GUESTFISH # cow filter test. diff --git a/tests/test-cache-on-read.sh b/tests/test-cache-on-read.sh new file mode 100755 index 0000000..51764a2 --- /dev/null +++ b/tests/test-cache-on-read.sh @@ -0,0 +1,66...

v1 was here: https://www.redhat.com/archives/libguestfs/2019-September/msg00100.html In v2 I've changed the patch so it avoids calling realloc at all in this case. The patch is a bit longer this way. But I don't see any other alternative if we are to avoid having a "realloc wrapper" of some kind that we use everywhere, which I guess we should avoid because it makes plugins

...am b/tests/Makefile.am index 3d78e7a2..bc308c5d 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -110,6 +110,7 @@ EXTRA_DIST = \ test-rate-dynamic.sh \ test.rb \ test-readahead-copy.sh \ + test-shutdown.sh \ test-ssh.sh \ test.tcl \ test-shebang-perl.sh \ @@ -955,7 +956,8 @@ if HAVE_GUESTFISH TESTS += test-cow.sh endif HAVE_GUESTFISH -# delay filter test. +# delay filter tests. +TESTS += test-shutdown.sh LIBGUESTFS_TESTS += test-delay test_delay_SOURCES = test-delay.c test.h diff --git a/tests/test-shutdown.sh b/tests/test-shutdown.sh new file mode 100755 index 00000000..0ac9c1eb...

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

...ault export name, C<"">. =back diff --git a/tests/Makefile.am b/tests/Makefile.am index 8a799ccf..911fa2b3 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1373,23 +1373,31 @@ EXTRA_DIST += test-exportname.sh # ext2 filter test. if HAVE_MKE2FS_WITH_D if HAVE_EXT2 -if HAVE_GUESTFISH -LIBGUESTFS_TESTS += test-ext2 +TESTS += test-ext2-exportname.sh +EXTRA_DIST += test-ext2-exportname.sh + check_DATA += ext2.img CLEANFILES += ext2.img -ext2.img: disk +ext2.img: disk test-ext2-exportname.sh rm -f $@ $@-t + echo /disks/disk.img > manifest guestfish \ sparse $@-t 2G...

v2: - Fixes a number of bugs in corner cases. - Uses a 1M block size to fetch from the underlying plugin. This improves performance considerably. I also tested this much more thoroughly and can't find any more bugs. Rich.

...exist, otherwise nbdkit fails. Also, give the > fake disk a less generic file name. The fix is fine but this description is wrong. The actual problem is you don't have guestfish installed, which is required to build ‘disk’. However ‘test-single.sh’ is outside the automake conditional for HAVE_GUESTFISH, so the test can run without ‘disk’ having been created. ACK, but with the description fixed to reflect what's really going on. There may be other tests which are similarly broken, I didn't check. Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones Re...

...a/tests/Makefile.am b/tests/Makefile.am index 4582120..0cc2618 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -328,7 +328,7 @@ test_xz_LDADD = libtest.la $(LIBGUESTFS_LIBS) disk.xz: disk rm -f $@ - xz --best -c disk > $@ + xz --best --block-size=16777216 -c disk > $@ endif HAVE_GUESTFISH endif HAVE_LIBLZMA -- 2.15.1

FYI; I'm going to push this because it's such an obvious fix. Rich.