From: Osier Yang <jyang@redhat.com>
Date: Wed, 3 Nov 2010 10:43:11 +0000 (+0100)
Subject: tests: fix daemon-conf testing failure
X-Git-Tag: v0.8.6~176
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d9c75c8d376c15ace7b3fff5e802bfb17fa630e1;p=thirdparty%2Flibvirt.git

tests: fix daemon-conf testing failure

libvirtd.conf uses "libvirt" as the value of "unix_sock_group",
however, group "libvirt" may not exist on the system, in this case
the case will always fail.

As a solution, replace "libvirt" with "$USER" in "tmp.conf".
---

diff --git a/tests/daemon-conf b/tests/daemon-conf
index 6c91d9686a..f2b513d72d 100755
--- a/tests/daemon-conf
+++ b/tests/daemon-conf
@@ -25,6 +25,9 @@ grep -v '\"PARAMETER = VALUE\"' "$conf" | grep '[a-z_]  *=  *[^ ]' | grep -vE '^
 # Start with the sample libvirtd.conf file, uncommenting all real directives.
 sed -n 's/^#\([^ #]\)/\1/p' "$conf" > tmp.conf
 
+sed -e "s/^\(unix_sock_group =\).*/\1 \"$USER\"/g" tmp.conf > k
+mv k tmp.conf
+
 # Iterate through that list of directives, corrupting one RHS at a
 # time and running libvirtd with the resulting config.  Each libvirtd
 # invocation must fail.