mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-08-26 18:41:17 +00:00
don't fail daemon-conf test when configured --without-qemu
* tests/Makefile.am (TESTS_ENVIRONMENT): Define CONFIG_HEADER. * tests/daemon-conf: Use test-lib.sh. Skip this test when configured --without-qemu.
This commit is contained in:
parent
bdd5094d8f
commit
6b4b4eb29c
@ -1,3 +1,10 @@
|
|||||||
|
Tue Feb 17 11:21:00 +0100 2009 Jim Meyering <meyering@redhat.com>
|
||||||
|
|
||||||
|
don't fail daemon-conf test when configured --without-qemu
|
||||||
|
* tests/Makefile.am (TESTS_ENVIRONMENT): Define CONFIG_HEADER.
|
||||||
|
* tests/daemon-conf: Use test-lib.sh.
|
||||||
|
Skip this test when configured --without-qemu.
|
||||||
|
|
||||||
Tue Feb 17 11:21:00 +0100 2009 Jim Meyering <meyering@redhat.com>
|
Tue Feb 17 11:21:00 +0100 2009 Jim Meyering <meyering@redhat.com>
|
||||||
|
|
||||||
accommodate configuring --without-lxc --without-qemu
|
accommodate configuring --without-lxc --without-qemu
|
||||||
|
@ -120,6 +120,7 @@ TESTS_ENVIRONMENT = \
|
|||||||
abs_top_srcdir=`cd '$(top_srcdir)'; pwd` \
|
abs_top_srcdir=`cd '$(top_srcdir)'; pwd` \
|
||||||
abs_builddir=`cd '$(builddir)'; pwd` \
|
abs_builddir=`cd '$(builddir)'; pwd` \
|
||||||
abs_srcdir=`cd '$(srcdir)'; pwd` \
|
abs_srcdir=`cd '$(srcdir)'; pwd` \
|
||||||
|
CONFIG_HEADER='$(abs_top_builddir)/lib/config.h' \
|
||||||
PATH="$(path_add)$(PATH_SEPARATOR)$$PATH" \
|
PATH="$(path_add)$(PATH_SEPARATOR)$$PATH" \
|
||||||
SHELL="$(SHELL)" \
|
SHELL="$(SHELL)" \
|
||||||
LIBVIRT_DRIVER_DIR="$(abs_top_builddir)/src/.libs" \
|
LIBVIRT_DRIVER_DIR="$(abs_top_builddir)/src/.libs" \
|
||||||
|
@ -6,16 +6,12 @@ if test "$VERBOSE" = yes; then
|
|||||||
libvirtd --version
|
libvirtd --version
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Boilerplate code to set up a test directory, cd into it,
|
test -z "$srcdir" && srcdir=$(pwd)
|
||||||
# and to ensure we remove it upon completion.
|
test -z "$abs_top_srcdir" && abs_top_srcdir=$(pwd)/..
|
||||||
this_test_() { echo "./$0" | sed 's,.*/,,'; }
|
. $srcdir/test-lib.sh
|
||||||
t_=$(this_test_)-$$
|
|
||||||
init_cwd_=$(pwd)
|
grep '^#define WITH_QEMU 1' $CONFIG_HEADER > /dev/null ||
|
||||||
trap 'st=$?; d='"$t_"';
|
skip_test_ "configured without QEMU support"
|
||||||
cd '"$init_cwd_"' && chmod -R u+rwx "$d" && rm -rf "$d" && exit $st' 0
|
|
||||||
trap '(exit $?); exit $?' 1 2 13 15
|
|
||||||
mkdir "$t_" || fail=1
|
|
||||||
cd "$t_" || fail=1
|
|
||||||
|
|
||||||
conf="$abs_top_srcdir/qemud/libvirtd.conf"
|
conf="$abs_top_srcdir/qemud/libvirtd.conf"
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user