search for: debug_qemu_fil

...return -1; + } + ret->port = 0; return 0; } diff --git a/tests/disks/test-qemu-drive.sh b/tests/disks/test-qemu-drive.sh index 19dd60a2f..181f21401 100755 --- a/tests/disks/test-qemu-drive.sh +++ b/tests/disks/test-qemu-drive.sh @@ -43,6 +43,8 @@ function fail () rm -f "$DEBUG_QEMU_FILE" +rm -f test-qemu-drive.sock + # Ceph (RBD). guestfish <<EOF ||: @@ -111,13 +113,18 @@ check_output grep -sq -- '-drive file=nbd:1.2.3.4:1234,' "$DEBUG_QEMU_FILE" || fail rm "$DEBUG_QEMU_FILE" -guestfish <<EOF ||: - add "" "for...

Miscellaneous fixes to: - Handling of Ceph drives now works end-to-end (RHBZ#1026688). - In particular, you can now use rbd:/// URIs in guestfish (and they work). - Parse Ceph & NBD network drives from libvirt XML correctly, so that existing domains with Ceph/NBD drives can be added (eg. using guestfish -d option). - Add more testing of the above.

...drive-libvirt.sh b/tests/disks/test-qemu-drive-libvirt.sh index 215a99e..b2656ba 100755 --- a/tests/disks/test-qemu-drive-libvirt.sh +++ b/tests/disks/test-qemu-drive-libvirt.sh @@ -47,6 +47,12 @@ export LIBGUESTFS_BACKEND=direct export LIBGUESTFS_HV="${abs_srcdir}/debug-qemu.sh" export DEBUG_QEMU_FILE="${abs_builddir}/test-qemu-drive-libvirt.out" +# Setup the fake pool. +pool_dir=tmp +rm -rf "$pool_dir" +mkdir "$pool_dir" +touch "$pool_dir/in-pool" + function check_output () { if [ ! -f "$DEBUG_QEMU_FILE" ]; then @@ -104,8 +110,18 @@ ch...

- run bindtests.opt only if available - use ocamlc -custom - Don't try to install native code if it hasn't been built (Thanks to Olaf Hering) --- mllib/Makefile.am | 2 +- ocaml/Makefile.am | 7 ++++++- ocaml/examples/Makefile.am | 11 ++++------- ocaml/run-bindtests | 2 ++ 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/mllib/Makefile.am

...block_size value. + +set -e + +$TEST_FUNCTIONS +skip_if_skipped +skip_unless_libvirt_minimum_version 1 1 3 + +guestfish="guestfish -c test://$abs_builddir/test-qemu-drive-libvirt.xml" + +export LIBGUESTFS_BACKEND=direct +export LIBGUESTFS_HV="${abs_srcdir}/debug-qemu.sh" +export DEBUG_QEMU_FILE="${abs_builddir}/test-qemu-drive-with-blocksize-libvirt.out" + +function check_output () +{ + if [ ! -f "$DEBUG_QEMU_FILE" ]; then + echo "$0: guestfish command failed, see previous error messages" + exit 1 + fi +} + +function fail () +{ + echo...

...block_size value. + +set -e + +$TEST_FUNCTIONS +skip_if_skipped +skip_unless_libvirt_minimum_version 1 1 3 + +guestfish="guestfish -c test://$abs_builddir/test-qemu-drive-libvirt.xml" + +export LIBGUESTFS_BACKEND=direct +export LIBGUESTFS_HV="${abs_srcdir}/debug-qemu.sh" +export DEBUG_QEMU_FILE="${abs_builddir}/test-qemu-drive-with-blocksize-libvirt.out" + +function check_output () +{ + if [ ! -f "$DEBUG_QEMU_FILE" ]; then + echo "$0: guestfish command failed, see previous error messages" + exit 1 + fi +} + +function fail () +{ + echo...

These are my thoughts on adding a test harness to run tests instead of using automake. The aim of this exercise is to allow us to run the full test suite on an installed copy of libguestfs. Another aim is to allow us to work around all the limitations and problems of automake. The first patch makes an observation that since the ./run script sets up $PATH to contain all the directories

Previously I posted a work-in-progress preview of this patch series: https://www.redhat.com/archives/libguestfs/2017-February/msg00224.html This is the finished version that updates all of the shell-script based tests. It passes 'make check', 'make check-direct' and 'make check-slow'. Rich.