diff -r 05bf8693c735 tools/xm-test/tests/security-acm/01_security-acm_basic.py --- a/tools/xm-test/tests/security-acm/01_security-acm_basic.py Wed Oct 18 15:08:58 2006 +++ b/tools/xm-test/tests/security-acm/01_security-acm_basic.py Wed Oct 18 15:06:32 2006 @@ -23,6 +23,9 @@ 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 05bf8693c735 tools/xm-test/tests/security-acm/Makefile.am --- a/tools/xm-test/tests/security-acm/Makefile.am Wed Oct 18 15:08:58 2006 +++ b/tools/xm-test/tests/security-acm/Makefile.am Wed Oct 18 15:06:32 2006 @@ -15,7 +15,10 @@ %.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