ia64/xen-unstable

changeset 11958:2c29a2e42937

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@us.ibm.com>
author Ewan Mellor <ewan@xensource.com>
date Tue Oct 24 14:47:41 2006 +0100 (2006-10-24)
parents e6b48aabee3e
children 55ff34dceb0b
files tools/xm-test/lib/XmTestLib/acm.py tools/xm-test/runtest.sh
line diff
     1.1 --- a/tools/xm-test/lib/XmTestLib/acm.py	Tue Oct 24 14:47:17 2006 +0100
     1.2 +++ b/tools/xm-test/lib/XmTestLib/acm.py	Tue Oct 24 14:47:41 2006 +0100
     1.3 @@ -26,7 +26,7 @@ except:
     1.4      ACM_LABEL_RESOURCES = False
     1.5  
     1.6  labeled_resources = {}
     1.7 -acm_verbose = True
     1.8 +acm_verbose = False
     1.9  
    1.10  def isACMEnabled():
    1.11      return security.on()
     2.1 --- a/tools/xm-test/runtest.sh	Tue Oct 24 14:47:17 2006 +0100
     2.2 +++ b/tools/xm-test/runtest.sh	Tue Oct 24 14:47:41 2006 +0100
     2.3 @@ -199,7 +199,10 @@ run=yes
     2.4  unsafe=no
     2.5  GROUPENTERED=default
     2.6  
     2.7 -cp -f tests/security-acm/xm-test-security_policy.xml /etc/xen/acm-security/policies
     2.8 +if [ -d /etc/xen/acm-security/policies ]; then
     2.9 +	cp -f tests/security-acm/xm-test-security_policy.xml \
    2.10 +	      /etc/xen/acm-security/policies
    2.11 +fi
    2.12  
    2.13  # Resolve options
    2.14  while [ $# -gt 0 ]