From: Matthias Bolte <matthias.bolte@googlemail.com>
Date: Tue, 19 Oct 2010 18:27:51 +0000 (+0200)
Subject: Don't let daemon-conf test fail when auditing is disabled
X-Git-Tag: v0.8.5~73
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e75191192973ea23fd56cb7a74af806f70dd1b39;p=thirdparty%2Flibvirt.git

Don't let daemon-conf test fail when auditing is disabled
---

diff --git a/tests/daemon-conf b/tests/daemon-conf
index 0e756d4538..6c91d9686a 100755
--- a/tests/daemon-conf
+++ b/tests/daemon-conf
@@ -83,8 +83,11 @@ if test 108 -lt `echo $SOCKPATH | wc -c`; then
     skip_test_ "CWD too long"
 fi
 
-# Replace the invalid host_uuid with one that is valid:
-sed 's/^\(host_uuid =.*\)0"$/\11"/' tmp.conf > k; mv k tmp.conf
+# Replace the invalid host_uuid with one that is valid and
+# relax audit_level from 2 to 1, otherwise libvirtd will report an error
+# when auditing is disabled on the host or during compilation
+sed 's/^\(host_uuid =.*\)0"$/\11"/; s/^\(audit_level =.*\)2$/\1 1/' tmp.conf > k
+mv k tmp.conf
 
 $abs_top_builddir/daemon/libvirtd --pid-file=pid-file --config=tmp.conf \
     > log 2>&1 & pid=$!