[Xen-changelog] Merge.

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

# HG changeset patch
# User smh22@xxxxxxxxxxxxxxxxxxxx
# Node ID 388c59fefaa6add89ca38622f2170cb7c98429ba
# Parent  c5e80cb40c466e0758b76579ae535c597b08862e
# Parent  9e13e1d4b33ff8b2d48c174ec974e95207213cce
Merge.

diff -r c5e80cb40c46 -r 388c59fefaa6 
tools/xm-test/tests/vtpm/02_vtpm-cat_pcrs.py
--- a/tools/xm-test/tests/vtpm/02_vtpm-cat_pcrs.py      Thu Apr  6 16:47:37 2006
+++ b/tools/xm-test/tests/vtpm/02_vtpm-cat_pcrs.py      Thu Apr  6 16:49:21 2006
@@ -46,6 +46,7 @@
     FAIL(str(e))
 
 if re.search("No such file",run["output"]):
+    vtpm_cleanup(domName)
     FAIL("TPM frontend support not compiled into (domU?) kernel")
 
 console.closeConsole()
diff -r c5e80cb40c46 -r 388c59fefaa6 
tools/xm-test/tests/vtpm/03_vtpm-susp_res.py
--- a/tools/xm-test/tests/vtpm/03_vtpm-susp_res.py      Thu Apr  6 16:47:37 2006
+++ b/tools/xm-test/tests/vtpm/03_vtpm-susp_res.py      Thu Apr  6 16:49:21 2006
@@ -47,6 +47,7 @@
     FAIL(str(e))
 
 if re.search("No such file",run["output"]):
+    vtpm_cleanup(domName)
     FAIL("TPM frontend support not compiled into (domU?) kernel")
 
 console.closeConsole()

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