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

[Richard W.M. Jones]

On Tue, Dec 02, 2014 at 07:11:55PM +0200, Nikos Skalkotos wrote:
> Signed-off-by: Nikos Skalkotos <skalkoto at 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)

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 at 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