]> xenbits.xensource.com Git - people/liuw/libxenctrl-split/libvirt.git/commitdiff
Don't let daemon-conf test fail when auditing is disabled
authorMatthias Bolte <matthias.bolte@googlemail.com>
Tue, 19 Oct 2010 18:27:51 +0000 (20:27 +0200)
committerMatthias Bolte <matthias.bolte@googlemail.com>
Wed, 20 Oct 2010 12:01:03 +0000 (14:01 +0200)
tests/daemon-conf

index 0e756d453845febf10a8d68b034d7df273fc3ac1..6c91d9686aa37d91a4991e4952954fe167beb610 100755 (executable)
@@ -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=$!