[Xen-changelog] [xen-unstable] [ACM] An environment where ACM and its tools have not been installed before

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

# HG changeset patch
# User kfraser@xxxxxxxxxxxxxxxxxxxxx
# Node ID d27d1f8ca25c8977fbb13d84fb31b9442dbd2030
# Parent  d088aec406c04282eed35a0b31e3fede0132f883
[ACM] An environment where ACM and its tools have not been installed before
will throw an error during 'make' of the test suite. This fixes the problem.

Signed-off-by: Stefan Berger <stefanb@xxxxxxxxxx>
---
 tools/xm-test/tests/security-acm/01_security-acm_basic.py |    3 +++
 tools/xm-test/tests/security-acm/Makefile.am              |    5 ++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff -r d088aec406c0 -r d27d1f8ca25c 
tools/xm-test/tests/security-acm/01_security-acm_basic.py
--- a/tools/xm-test/tests/security-acm/01_security-acm_basic.py Thu Oct 19 
15:14:25 2006 +0100
+++ b/tools/xm-test/tests/security-acm/01_security-acm_basic.py Thu Oct 19 
15:15:36 2006 +0100
@@ -23,6 +23,9 @@ testlabel = "blue"
 testlabel = "blue"
 vmconfigfile = "/tmp/xm-test.conf"
 testresource = "phy:ram0"
+
+if not isACMEnabled():
+    SKIP("Not running this test since ACM not enabled.")
 
 status, output = traceCommand("xm makepolicy %s" % (testpolicy))
 if status != 0 or output != "":
diff -r d088aec406c0 -r d27d1f8ca25c 
tools/xm-test/tests/security-acm/Makefile.am
--- a/tools/xm-test/tests/security-acm/Makefile.am      Thu Oct 19 15:14:25 
2006 +0100
+++ b/tools/xm-test/tests/security-acm/Makefile.am      Thu Oct 19 15:15:36 
2006 +0100
@@ -15,7 +15,10 @@ TESTS_ENVIRONMENT=@TENV@
 %.test: %.py
        cp $< $@
        chmod +x $@
-       @cp -f xm-test-security_policy.xml /etc/xen/acm-security/policies
+       @if [ -d /etc/xen/acm-security/policies ]; then \
+               cp -f xm-test-security_policy.xml      \
+                     /etc/xen/acm-security/policies;  \
+       fi;
 
 clean-local: am_config_clean-local
 

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