diff options
author | Ewan Mellor <ewan@xensource.com> | 2007-01-11 18:56:59 +0000 |
---|---|---|
committer | Ewan Mellor <ewan@xensource.com> | 2007-01-11 18:56:59 +0000 |
commit | aeb7c09a6613aae8e39c271283f8db9f7a99d32f (patch) | |
tree | f20aaafcbd4be33d28a8b78bb3a0b95f7a1836f1 /tools/xm-test | |
parent | 2b1f4094a6bb571855c2a1ca54f5e6ded34913c5 (diff) | |
download | xen-aeb7c09a6613aae8e39c271283f8db9f7a99d32f.tar.gz xen-aeb7c09a6613aae8e39c271283f8db9f7a99d32f.tar.bz2 xen-aeb7c09a6613aae8e39c271283f8db9f7a99d32f.zip |
I added a parameter '-md' to 'runtest.sh' for running the xm test suite
in a mode where all created domains a created as xend-managed domains.
This patch also fixes a problem related to calling 'xm domid' on a
currently suspended domain if that domain is a managed domain. In that
case a 'None' is returned by Xend, which I default to '-1'.
Signed-off-by: Stefan Berger <stefanb@us.ibm.com>
Diffstat (limited to 'tools/xm-test')
-rw-r--r-- | tools/xm-test/lib/XmTestLib/Xm.py | 2 | ||||
-rwxr-xr-x | tools/xm-test/runtest.sh | 8 |
2 files changed, 10 insertions, 0 deletions
diff --git a/tools/xm-test/lib/XmTestLib/Xm.py b/tools/xm-test/lib/XmTestLib/Xm.py index 43ee90dd7c..6f1e33c153 100644 --- a/tools/xm-test/lib/XmTestLib/Xm.py +++ b/tools/xm-test/lib/XmTestLib/Xm.py @@ -49,6 +49,8 @@ def domid(name): if status != 0 or "Traceback" in output: return -1 + if output == "None": + return -1 try: return int(output) except: diff --git a/tools/xm-test/runtest.sh b/tools/xm-test/runtest.sh index 22c0736bf2..5b102b7f45 100755 --- a/tools/xm-test/runtest.sh +++ b/tools/xm-test/runtest.sh @@ -16,6 +16,7 @@ usage() { echo " -r <url> : url of test results repository to use" echo " -s <report> : just submit report <report>" echo " -u : unsafe -- do not run the sanity checks before starting" + echo " -md : all created domains are xend-'managed' domains" echo " -h | --help : show this help" } @@ -218,11 +219,14 @@ run=yes unsafe=no GROUPENTERED=default +#Prepare for usage with ACM if [ -d /etc/xen/acm-security/policies ]; then cp -f tests/security-acm/xm-test-security_policy.xml \ /etc/xen/acm-security/policies fi +unset XM_MANAGED_DOMAINS + # Resolve options while [ $# -gt 0 ] do @@ -260,6 +264,10 @@ while [ $# -gt 0 ] unsafe=yes report=no ;; + -md) + echo "(use managed domains)" + export XM_MANAGED_DOMAINS=1 + ;; -h|--help) usage exit 0 |