Index: root/xen-unstable.hg/tools/xm-test/tests/vtpm/09_vtpm-xapi.py =================================================================== --- root.orig/xen-unstable.hg/tools/xm-test/tests/vtpm/09_vtpm-xapi.py +++ root/xen-unstable.hg/tools/xm-test/tests/vtpm/09_vtpm-xapi.py @@ -91,7 +91,7 @@ if vtpm_uuid not in vm_vtpms: try: console = domain.start() except DomainError, e: - FAIL("Unable to create domain (%s)" % domName) + FAIL("Unable to create domain (%s)") try: console.sendInput("input") Index: root/xen-unstable.hg/tools/xm-test/tests/vtpm/vtpm_utils.py =================================================================== --- root.orig/xen-unstable.hg/tools/xm-test/tests/vtpm/vtpm_utils.py +++ root/xen-unstable.hg/tools/xm-test/tests/vtpm/vtpm_utils.py @@ -8,7 +8,8 @@ from XmTestLib import * if ENABLE_HVM_SUPPORT: SKIP("vtpm tests not supported for HVM domains") -status, output = traceCommand("ps aux | grep vtpm_manager | grep -v grep") +status, output = traceCommand("COLUMNS=200 ; " + "ps aux | grep vtpm_manager | grep -v grep") if output == "": SKIP("virtual TPM manager must be started to run this test; might " "need /dev/tpm0")