From: Jamie Strandboge <jamie@ubuntu.com>
Date: Tue, 6 Apr 2010 20:59:31 +0000 (+0200)
Subject: Update of the apparmore regression tests
X-Git-Tag: v0.8.0~45
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ef962afb7405d8e9ee7024f2061049cf7778fce3;p=thirdparty%2Flibvirt.git

Update of the apparmore regression tests

* tests/virt-aa-helper-test: test augmented with hostdev and sdl display
  checks
---

diff --git a/tests/virt-aa-helper-test b/tests/virt-aa-helper-test
index a776f7f64b..3a2e74b1a7 100755
--- a/tests/virt-aa-helper-test
+++ b/tests/virt-aa-helper-test
@@ -204,7 +204,8 @@ if [ "$test_hostdev" = "yes" ]; then
     cat "$template_xml" | sed "s,###UUID###,$uuid,g" | sed "s,###DISK###,$disk1,g" | sed "s,</disk>,</disk><hostdev mode='subsystem' type='usb'><source><address bus='002' device='004'/></source></hostdev>,g" > "$test_xml"
     testme "0" "create hostdev (USB)" "-c -u $valid_uuid" "$test_xml"
 
-    cat "$template_xml" | sed "s,###UUID###,$uuid,g" | sed "s,###DISK###,$disk1,g" | sed "s,</disk>,</disk><hostdev mode='subsystem' type='pci'><source><address bus='0x00' slot='0x00' function='0x0'/></source></hostdev>,g" > "$test_xml"
+    cat "$template_xml" | sed "s,###UUID###,$uuid,g" | sed "s,###DISK###,$disk1,g" | sed "s,</disk>,</disk><hostdev mode='subsystem' type='pci'><source><address bus='0x00' slot='0x19' function='0x0'/></source></hostdev>,g" > "$test_xml"
+
     testme "0" "create hostdev (PCI)" "-c -u $valid_uuid" "$test_xml"
 fi
 
@@ -265,6 +266,9 @@ testme "0" "initrd is /initrd/ramdisk" "-r -u $valid_uuid" "$test_xml"
 cat "$template_xml" | sed "s,###UUID###,$uuid,g" | sed "s,###DISK###,$disk1,g" | sed "s,</os>,<initrd>/initrd.img</initrd></os>,g" > "$test_xml"
 testme "0" "initrd is /initrd.img" "-r -u $valid_uuid" "$test_xml"
 
+cat "$template_xml" | sed "s,###UUID###,$uuid,g" | sed "s,###DISK###,$disk1,g" | sed "s,<graphics*,<graphics type='sdl' display=':0.0' xauth='/home/myself/.Xauthority'/>,g" > "$test_xml"
+testme "0" "sdl Xauthority" "-r -u $valid_uuid" "$test_xml"
+
 testme "0" "help" "-h"
 
 echo "" >$output