[Xen-changelog] [xen-unstable] This puts two small fixes in the xm-test suite:

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Ewan Mellor <ewan@xxxxxxxxxxxxx>
# Node ID 2c29a2e42937e7e57c1fa465298c32c1d5d39bd4
# Parent  e6b48aabee3eae609bd2b5b770ff4d4c8f4718dc
This puts two small fixes in the xm-test suite:
- it turns off verbose mode of the ACM module
- copies the test policy to the policies directory only if the directory
has been created

Signed-off-by: Stefan Berger <stefanb@xxxxxxxxxx>
---
 tools/xm-test/lib/XmTestLib/acm.py |    2 +-
 tools/xm-test/runtest.sh           |    5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff -r e6b48aabee3e -r 2c29a2e42937 tools/xm-test/lib/XmTestLib/acm.py
--- a/tools/xm-test/lib/XmTestLib/acm.py        Tue Oct 24 14:47:17 2006 +0100
+++ b/tools/xm-test/lib/XmTestLib/acm.py        Tue Oct 24 14:47:41 2006 +0100
@@ -26,7 +26,7 @@ except:
     ACM_LABEL_RESOURCES = False
 
 labeled_resources = {}
-acm_verbose = True
+acm_verbose = False
 
 def isACMEnabled():
     return security.on()
diff -r e6b48aabee3e -r 2c29a2e42937 tools/xm-test/runtest.sh
--- a/tools/xm-test/runtest.sh  Tue Oct 24 14:47:17 2006 +0100
+++ b/tools/xm-test/runtest.sh  Tue Oct 24 14:47:41 2006 +0100
@@ -199,7 +199,10 @@ unsafe=no
 unsafe=no
 GROUPENTERED=default
 
-cp -f tests/security-acm/xm-test-security_policy.xml 
/etc/xen/acm-security/policies
+if [ -d /etc/xen/acm-security/policies ]; then
+       cp -f tests/security-acm/xm-test-security_policy.xml \
+             /etc/xen/acm-security/policies
+fi
 
 # Resolve options
 while [ $# -gt 0 ]

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog