[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[libvirt] [PATCH] make sure we call the freshly build libvirtd



...not the one in $PATH. I was wondering why this test kept failing...
 -- Guido

---
 tests/daemon-conf |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/tests/daemon-conf b/tests/daemon-conf
index db1f0d3..4a42d1e 100755
--- a/tests/daemon-conf
+++ b/tests/daemon-conf
@@ -1,6 +1,8 @@
 #!/bin/sh
 # Get coverage of libvirtd's config-parsing code.
 
+LIBVIRTD=$abs_top_builddir/qemud/libvirtd
+
 # Boilerplate code to set up a test directory, cd into it,
 # and to ensure we remove it upon completion.
 this_test_() { echo "./$0" | sed 's,.*/,,'; }
@@ -27,7 +29,7 @@ while :; do
   # Change an RHS that starts with '"' or '[' to "3".
   # Change an RHS that starts with 0 or 1 to the string '"foo"'.
   sed "$i"'s/ = [["].*/ = 3/;'"$i"'s/ = [01].*/ = "foo"/' tmp.conf > $f
-  libvirtd --config=$f 2> err && fail=1
+  $LIBVIRTD --config=$f 2> err && fail=1
   case $rhs in
     # '"'*) msg='should be a string';;
     '"'*) msg='invalid type: got long; expected string';;
@@ -48,7 +50,7 @@ while :; do
 done
 
 # Run with the unmodified config file.
-libvirtd --config=tmp.conf > log 2>&1 & pid=$!
+$LIBVIRTD --config=tmp.conf > log 2>&1 & pid=$!
 sleep 2
 kill $pid
 
-- 
1.5.6.3


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]