ia64/xen-unstable

changeset 9623:388c59fefaa6

Merge.
author smh22@firebug.cl.cam.ac.uk
date Thu Apr 06 17:49:21 2006 +0100 (2006-04-06)
parents c5e80cb40c46 9e13e1d4b33f
children 24d25894f071 e049baa9055d
files
line diff
     1.1 --- a/tools/xm-test/tests/vtpm/02_vtpm-cat_pcrs.py	Thu Apr 06 17:47:37 2006 +0100
     1.2 +++ b/tools/xm-test/tests/vtpm/02_vtpm-cat_pcrs.py	Thu Apr 06 17:49:21 2006 +0100
     1.3 @@ -46,6 +46,7 @@ except ConsoleError, e:
     1.4      FAIL(str(e))
     1.5  
     1.6  if re.search("No such file",run["output"]):
     1.7 +    vtpm_cleanup(domName)
     1.8      FAIL("TPM frontend support not compiled into (domU?) kernel")
     1.9  
    1.10  console.closeConsole()
     2.1 --- a/tools/xm-test/tests/vtpm/03_vtpm-susp_res.py	Thu Apr 06 17:47:37 2006 +0100
     2.2 +++ b/tools/xm-test/tests/vtpm/03_vtpm-susp_res.py	Thu Apr 06 17:49:21 2006 +0100
     2.3 @@ -47,6 +47,7 @@ except ConsoleError, e:
     2.4      FAIL(str(e))
     2.5  
     2.6  if re.search("No such file",run["output"]):
     2.7 +    vtpm_cleanup(domName)
     2.8      FAIL("TPM frontend support not compiled into (domU?) kernel")
     2.9  
    2.10  console.closeConsole()