diff options
| author | Ewan Mellor <ewan@xensource.com> | 2006-10-24 14:47:41 +0100 |
|---|---|---|
| committer | Ewan Mellor <ewan@xensource.com> | 2006-10-24 14:47:41 +0100 |
| commit | 64dd1b77aeb73819217b98a0682728d1369dc562 (patch) | |
| tree | ffb551b14eb14473aef01d11ff628ca001065e39 /tools/xm-test | |
| parent | d2e25ca823455d96c44b144ca9b7c4513259f096 (diff) | |
| download | xen-64dd1b77aeb73819217b98a0682728d1369dc562.tar.gz xen-64dd1b77aeb73819217b98a0682728d1369dc562.tar.bz2 xen-64dd1b77aeb73819217b98a0682728d1369dc562.zip | |
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>
Diffstat (limited to 'tools/xm-test')
| -rw-r--r-- | tools/xm-test/lib/XmTestLib/acm.py | 2 | ||||
| -rwxr-xr-x | tools/xm-test/runtest.sh | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/tools/xm-test/lib/XmTestLib/acm.py b/tools/xm-test/lib/XmTestLib/acm.py index dd1e67646d..a0d8a43c09 100644 --- a/tools/xm-test/lib/XmTestLib/acm.py +++ b/tools/xm-test/lib/XmTestLib/acm.py @@ -26,7 +26,7 @@ except: ACM_LABEL_RESOURCES = False labeled_resources = {} -acm_verbose = True +acm_verbose = False def isACMEnabled(): return security.on() diff --git a/tools/xm-test/runtest.sh b/tools/xm-test/runtest.sh index 623598cd20..7008972fae 100755 --- a/tools/xm-test/runtest.sh +++ b/tools/xm-test/runtest.sh @@ -199,7 +199,10 @@ run=yes 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 ] |