On Thu, Feb 11, 2016 at 06:41:27PM +0100, Pino Toscano wrote:

They will fail anyway in that case, so run them only when the FUSE support is built in. --- fish/Makefile.am | 6 +++++- sysprep/Makefile.am | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/fish/Makefile.am b/fish/Makefile.am index fc7c729..5ffa0f1 100644 --- a/fish/Makefile.am +++ b/fish/Makefile.am @@ -297,7 +297,6 @@ TESTS += \ test-find0.sh \ test-inspect.sh \ test-glob.sh \ - test-mount-local.sh \ test-prep.sh \ test-read-file.sh \ test-remote.sh \ @@ -306,6 +305,11 @@ TESTS += \ test-run.sh \ test-stringlist.sh \ test-upload-to-dir.sh + +if HAVE_FUSE +TESTS += \ + test-mount-local.sh +endif endif

check-valgrind: diff --git a/sysprep/Makefile.am b/sysprep/Makefile.am index b3ad3c3..50eda8f 100644 --- a/sysprep/Makefile.am +++ b/sysprep/Makefile.am @@ -213,8 +213,12 @@ TESTS_ENVIRONMENT = \ if ENABLE_APPLIANCE TESTS = \ test-virt-sysprep.sh \ - test-virt-sysprep-passwords.sh \ + test-virt-sysprep-passwords.sh + +if HAVE_FUSE +TESTS += \ test-virt-sysprep-script.sh +endif HAVE_FUSE endif ENABLE_APPLIANCE

check-valgrind:

ACK. Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones Read my programming and virtualization blog: http://rwmj.wordpress.com libguestfs lets you edit virtual machines. Supports shell scripting, bindings from many languages. http://libguestfs.org