ia64/xen-unstable

changeset 11902:d27d1f8ca25c

[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@us.ibm.com>
author kfraser@localhost.localdomain
date Thu Oct 19 15:15:36 2006 +0100 (2006-10-19)
parents d088aec406c0
children a855c7d3a536
files tools/xm-test/tests/security-acm/01_security-acm_basic.py tools/xm-test/tests/security-acm/Makefile.am
line diff
     1.1 --- a/tools/xm-test/tests/security-acm/01_security-acm_basic.py	Thu Oct 19 15:14:25 2006 +0100
     1.2 +++ b/tools/xm-test/tests/security-acm/01_security-acm_basic.py	Thu Oct 19 15:15:36 2006 +0100
     1.3 @@ -24,6 +24,9 @@ testlabel = "blue"
     1.4  vmconfigfile = "/tmp/xm-test.conf"
     1.5  testresource = "phy:ram0"
     1.6  
     1.7 +if not isACMEnabled():
     1.8 +    SKIP("Not running this test since ACM not enabled.")
     1.9 +
    1.10  status, output = traceCommand("xm makepolicy %s" % (testpolicy))
    1.11  if status != 0 or output != "":
    1.12      FAIL("'xm makepolicy' failed with status %d and output\n%s" %
     2.1 --- a/tools/xm-test/tests/security-acm/Makefile.am	Thu Oct 19 15:14:25 2006 +0100
     2.2 +++ b/tools/xm-test/tests/security-acm/Makefile.am	Thu Oct 19 15:15:36 2006 +0100
     2.3 @@ -15,7 +15,10 @@ TESTS_ENVIRONMENT=@TENV@
     2.4  %.test: %.py
     2.5  	cp $< $@
     2.6  	chmod +x $@
     2.7 -	@cp -f xm-test-security_policy.xml /etc/xen/acm-security/policies
     2.8 +	@if [ -d /etc/xen/acm-security/policies ]; then \
     2.9 +		cp -f xm-test-security_policy.xml      \
    2.10 +		      /etc/xen/acm-security/policies;  \
    2.11 +	fi;
    2.12  
    2.13  clean-local: am_config_clean-local
    2.14