Skip to content
Snippets Groups Projects
Commit 504f2039 authored by Konrad Weihmann's avatar Konrad Weihmann Committed by Steve Sakoman
Browse files

testexport: fallback for empty IMAGE_LINK_NAME


if IMAGE_LINK_NAME is set empty to disable the symlinking
for image artifacts in deploy, testexport fails, as the path assembly
is incorrect.
In that case fallback to IMAGE_NAME

(From OE-Core rev: 0c1d098e6dd08fa3a5aafca656457ac6badcef89)

(From OE-Core rev: a821a5810ae6edba5882a43e3c60c142f2acda9d)

Signed-off-by: default avatarKonrad Weihmann <kweihmann@outlook.com>
Signed-off-by: default avatarRichard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: default avatarSteve Sakoman <steve@sakoman.com>
parent 38ea1cb0
No related branches found
No related tags found
No related merge requests found
...@@ -50,7 +50,7 @@ def testexport_main(d): ...@@ -50,7 +50,7 @@ def testexport_main(d):
from oeqa.runtime.context import OERuntimeTestContextExecutor from oeqa.runtime.context import OERuntimeTestContextExecutor
image_name = ("%s/%s" % (d.getVar('DEPLOY_DIR_IMAGE'), image_name = ("%s/%s" % (d.getVar('DEPLOY_DIR_IMAGE'),
d.getVar('IMAGE_LINK_NAME'))) d.getVar('IMAGE_LINK_NAME') or d.getVar('IMAGE_NAME')))
tdname = "%s.testdata.json" % image_name tdname = "%s.testdata.json" % image_name
td = json.load(open(tdname, "r")) td = json.load(open(tdname, "r"))
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment