summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2015-09-11 13:24:50 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-09-12 22:48:47 +0100
commit6a71f661732671dd5ae5d3abce0ea41c7193754d (patch)
tree11511c991f026c6444e21c2d3107996291d0f52d /meta/classes
parent06cde90f9f4f35f0f8a1d7bf13e11e2559ad683b (diff)
downloadpoky-6a71f661732671dd5ae5d3abce0ea41c7193754d.tar.gz
testimage: Fix SDK extraction error handling
Currently if the SDK fails to extract, no error is shown and the test is marked as passed! Clearly this is incorrect, fix it to correctly raise an error. (From OE-Core rev: fb2235a21e45fa1a47c3b7a9a6a72c515ef10dd1) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/testimage.bbclass5
1 files changed, 4 insertions, 1 deletions
diff --git a/meta/classes/testimage.bbclass b/meta/classes/testimage.bbclass
index 19a37cb037..d4263df323 100644
--- a/meta/classes/testimage.bbclass
+++ b/meta/classes/testimage.bbclass
@@ -375,7 +375,10 @@ def testsdk_main(d):
375 sdktestdir = d.expand("${WORKDIR}/testimage-sdk/") 375 sdktestdir = d.expand("${WORKDIR}/testimage-sdk/")
376 bb.utils.remove(sdktestdir, True) 376 bb.utils.remove(sdktestdir, True)
377 bb.utils.mkdirhier(sdktestdir) 377 bb.utils.mkdirhier(sdktestdir)
378 subprocess.call("cd %s; %s <<EOF\n./tc\nY\nEOF" % (sdktestdir, tcname), shell=True) 378 try:
379 subprocess.check_output("cd %s; %s <<EOF\n./tc\nY\nEOF" % (sdktestdir, tcname), shell=True)
380 except subprocess.CalledProcessError as e:
381 bb.fatal("Couldn't install the SDK:\n%s" % e.output)
379 382
380 try: 383 try:
381 targets = glob.glob(d.expand(sdktestdir + "/tc/environment-setup-*")) 384 targets = glob.glob(d.expand(sdktestdir + "/tc/environment-setup-*"))