summaryrefslogtreecommitdiffstats
path: root/meta/classes/testsdk.bbclass
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2016-06-24 00:07:02 +1200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-07-08 09:57:23 +0100
commitff41cfb5086b429aeea720e380fbe8b930d107c0 (patch)
tree51ecd284fb86dc9c70f74f344f40beac3b0038ca /meta/classes/testsdk.bbclass
parent6677dd37ad3b1cdb8d805511c7a6234452ab77ad (diff)
downloadpoky-ff41cfb5086b429aeea720e380fbe8b930d107c0.tar.gz
classes/testsdk: print output correctly on failure
With Python 3 we get a bytes object from the command output and not a string, which gives some ugly formatting for error messages unless you decode it first. (From OE-Core rev: 798bec6fe43116b51247284eb4e415337b2e8e04) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/testsdk.bbclass')
-rw-r--r--meta/classes/testsdk.bbclass4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/testsdk.bbclass b/meta/classes/testsdk.bbclass
index f4dc2c36dc..18f7678d37 100644
--- a/meta/classes/testsdk.bbclass
+++ b/meta/classes/testsdk.bbclass
@@ -65,7 +65,7 @@ def testsdk_main(d):
65 try: 65 try:
66 subprocess.check_output("cd %s; %s <<EOF\n./tc\nY\nEOF" % (sdktestdir, tcname), shell=True) 66 subprocess.check_output("cd %s; %s <<EOF\n./tc\nY\nEOF" % (sdktestdir, tcname), shell=True)
67 except subprocess.CalledProcessError as e: 67 except subprocess.CalledProcessError as e:
68 bb.fatal("Couldn't install the SDK:\n%s" % e.output) 68 bb.fatal("Couldn't install the SDK:\n%s" % e.output.decode("utf-8"))
69 69
70 try: 70 try:
71 run_test_context(SDKTestContext, d, sdktestdir, tcname, pn) 71 run_test_context(SDKTestContext, d, sdktestdir, tcname, pn)
@@ -116,7 +116,7 @@ def testsdkext_main(d):
116 try: 116 try:
117 subprocess.check_output("%s -y -d %s/tc" % (tcname, testdir), shell=True) 117 subprocess.check_output("%s -y -d %s/tc" % (tcname, testdir), shell=True)
118 except subprocess.CalledProcessError as e: 118 except subprocess.CalledProcessError as e:
119 bb.fatal("Couldn't install the SDK EXT:\n%s" % e.output) 119 bb.fatal("Couldn't install the SDK EXT:\n%s" % e.output.decode("utf-8"))
120 120
121 try: 121 try:
122 bb.plain("Running SDK Compatibility tests ...") 122 bb.plain("Running SDK Compatibility tests ...")