[Xen-changelog] [xen-unstable] Revert change to vtpm_utils related to skipping the test when the tpm is not

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

# HG changeset patch
# User Ewan Mellor <ewan@xxxxxxxxxxxxx>
# Node ID d59d6a440a41bfdba172ed78c92f4b4eebefa23e
# Parent  fe5c178cdf2e8a3dadb08fefe787d9c095ec2844
Revert change to vtpm_utils related to skipping the test when the tpm is not
found -- we need to skip the test on non-TPM platforms, of course.

Signed-off-by: Ewan Mellor <ewan@xxxxxxxxxxxxx>
---
 tools/xm-test/tests/vtpm/vtpm_utils.py |    3 +++
 1 files changed, 3 insertions(+)

diff -r fe5c178cdf2e -r d59d6a440a41 tools/xm-test/tests/vtpm/vtpm_utils.py
--- a/tools/xm-test/tests/vtpm/vtpm_utils.py    Fri Sep 15 18:48:24 2006 +0100
+++ b/tools/xm-test/tests/vtpm/vtpm_utils.py    Fri Sep 15 23:54:04 2006 +0100
@@ -8,6 +8,9 @@ if ENABLE_HVM_SUPPORT:
 if ENABLE_HVM_SUPPORT:
     SKIP("vtpm tests not supported for HVM domains")
 
+if not os.path.exists("/dev/tpm0"):
+    SKIP("This machine has no hardware TPM; cannot run this test")
+
 status, output = traceCommand("ps aux | grep vtpm_manager | grep -v grep")
 if output == "":
     FAIL("virtual TPM manager must be started to run this test")

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