[PATCH 1/5] Remove extra space in inspect-fs-unix.c

[Nikos Skalkotos]

Signed-off-by: Nikos Skalkotos <skal...@grnet.gr>
---
src/inspect-fs-unix.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/inspect-fs-unix.c b/src/inspect-fs-unix.c
index 01a59f1..f55e53b 100644
--- a/src/inspect-fs-unix.c
+++ b/src/inspect-fs-unix.c
@@ -58,8 +58,8 @@ COMPILE_REGEXP (re_scientific_linux,
"Scientific Linux.*release (\\d+)\\.(\\d+)", 0)
COMPILE_REGEXP (re_scientific_linux_no_minor,
"Scientific Linux.*release (\\d+)", 0)
- COMPILE_REGEXP (re_oracle_linux_old,
- "Oracle Linux.*release (\\d+).*Update (\\d+)", 0)
+COMPILE_REGEXP (re_oracle_linux_old,
+ "Oracle Linux.*release (\\d+).*Update (\\d+)", 0)
COMPILE_REGEXP (re_oracle_linux,
"Oracle Linux.*release (\\d+)\\.(\\d+)", 0)
COMPILE_REGEXP (re_oracle_linux_no_minor, "Oracle Linux.*release (\\d+)", 0)
--
2.1.3

[Richard W.M. Jones]

I pushed this one. Unfortunately the rest fail the test suite:

$ make -C tests/mountable
make: Entering directory '/home/rjones/d/libguestfs/tests/mountable'
make: Nothing to be done for 'all'.
make: Leaving directory '/home/rjones/d/libguestfs/tests/mountable'
rjones@choo:~/d/libguestfs$ make -C tests/mountable check
make: Entering directory '/home/rjones/d/libguestfs/tests/mountable'
make test-internal-parse-mountable
make[1]: Entering directory '/home/rjones/d/libguestfs/tests/mountable'
make[1]: 'test-internal-parse-mountable' is up to date.
make[1]: Leaving directory '/home/rjones/d/libguestfs/tests/mountable'
make check-TESTS
make[1]: Entering directory '/home/rjones/d/libguestfs/tests/mountable'
2 seconds: ./test-internal-parse-mountable
PASS: test-internal-parse-mountable
/home/rjones/d/libguestfs/run --test ./test-mountable-inspect.sh
libguestfs: error: mount: mount_stub: btrfsvol:btrfsvol:/dev/sda2/root/root: expecting a btrfs volume
/home/rjones/d/libguestfs/tests/mountable/test-mountable-inspect.sh: error #1: unexpected output from inspect-get-mountpoints
/home/rjones/d/libguestfs/run: command failed with exit code 1
FAIL: test-mountable-inspect.sh
===================
1 of 2 tests failed
===================
Makefile:1643: recipe for target 'check-TESTS' failed
make[1]: *** [check-TESTS] Error 1
make[1]: Leaving directory '/home/rjones/d/libguestfs/tests/mountable'
Makefile:1766: recipe for target 'check-am' failed
make: *** [check-am] Error 2
make: Leaving directory '/home/rjones/d/libguestfs/tests/mountable'

Rich.

--
Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones
Read my programming and virtualization blog: http://rwmj.wordpress.com
virt-top is 'top' for virtual machines. Tiny program with many
powerful monitoring features, net stats, disk stats, logging, etc.
http://people.redhat.com/~rjones/virt-top

[Nikos Skalkotos]

Hello,

I've been trying to run the tests from master, before applying my
patches and it's not not working. I always get this:

# make -C tests/mountable check
make: Entering directory `/root/src/libguestfs/tests/mountable'
make test-internal-parse-mountable
make[1]: Entering directory `/root/src/libguestfs/tests/mountable'

make[1]: `test-internal-parse-mountable' is up to date.

make[1]: Leaving directory `/root/src/libguestfs/tests/mountable'
make check-TESTS
make[1]: Entering directory `/root/src/libguestfs/tests/mountable'
24 seconds: ./test-internal-parse-mountable
PASS: test-internal-parse-mountable
/root/src/libguestfs/run --test ./test-mountable-inspect.sh
libguestfs: error: qemu-img: test.qcow2: qemu-img exited with error
status 1.
To see full error messages you may need to enable debugging.
See http://libguestfs.org/guestfs-faq.1.html#debugging-libguestfs
/root/src/libguestfs/run: command failed with exit code 1

FAIL: test-mountable-inspect.sh
===================
1 of 2 tests failed
===================

make[1]: *** [check-TESTS] Error 1

make[1]: Leaving directory `/root/src/libguestfs/tests/mountable'

make: *** [check-am] Error 2

make: Leaving directory `/root/src/libguestfs/tests/mountable'

I tried it on Debian Jessie and an updated Fedora 20 system. Any hints?

Nikos

[Richard W.M. Jones]

On Wed, Dec 03, 2014 at 02:10:08PM +0200, Nikos Skalkotos wrote:
> Hello,
>
> I've been trying to run the tests from master, before applying my
> patches and it's not not working. I always get this:
>
> # make -C tests/mountable check
> make: Entering directory `/root/src/libguestfs/tests/mountable'
> make test-internal-parse-mountable
> make[1]: Entering directory `/root/src/libguestfs/tests/mountable'
> make[1]: `test-internal-parse-mountable' is up to date.
> make[1]: Leaving directory `/root/src/libguestfs/tests/mountable'
> make check-TESTS
> make[1]: Entering directory `/root/src/libguestfs/tests/mountable'
> 24 seconds: ./test-internal-parse-mountable
> PASS: test-internal-parse-mountable
> /root/src/libguestfs/run --test ./test-mountable-inspect.sh
> libguestfs: error: qemu-img: test.qcow2: qemu-img exited with error
> status 1.
> To see full error messages you may need to enable debugging.
> See http://libguestfs.org/guestfs-faq.1.html#debugging-libguestfs
> /root/src/libguestfs/run: command failed with exit code 1
> FAIL: test-mountable-inspect.sh

That's a different one from the error I was seeing last night. Enable
debugging to find out what's really going on.

$ make -C tests/mountable check LIBGUESTFS_DEBUG=1 LIBGUESTFS_TRACE=1

Rich.

--
Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones
Read my programming and virtualization blog: http://rwmj.wordpress.com

virt-p2v converts physical machines to virtual machines. Boot with a
live CD or over the network (PXE) and turn machines into KVM guests.
http://libguestfs.org/virt-v2v

[Nikos Skalkotos]

This was the problem:

qemu-img: Could not open '../guests/fedora-btrfs.img': No such file or
directory

I needed to run "make -C tests/guest check" before I could run the
mountable test.

Anyway, I'm resending you the remaining patches. Those one pass the test. I
should have been more conservative when touching existing code.

Nikos