summaryrefslogtreecommitdiffstats
path: root/meta/lib/oeqa
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2019-06-17 17:24:30 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-06-19 12:46:43 +0100
commitf25d8604ea3165f8789e1565a67193cfa28ed888 (patch)
treea28e5d87c13f8bdca48aea2e3ad34f802bcf3ff0 /meta/lib/oeqa
parentaf790692f5f1404b99561dbcf8f9df752d8c1f1e (diff)
downloadpoky-f25d8604ea3165f8789e1565a67193cfa28ed888.tar.gz
manifest.py: fix test_SDK_manifest_entries
TOOLCHAIN_OUTPUTNAME could be overridden. So use this variable directly instead of its default value ${SDK_NAME}-toolchain-${SDK_VERSION}. (From OE-Core rev: 35a13468f551fff6305ba1ebbcb5dd28e99ec050) Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oeqa')
-rw-r--r--meta/lib/oeqa/selftest/cases/manifest.py7
1 files changed, 2 insertions, 5 deletions
diff --git a/meta/lib/oeqa/selftest/cases/manifest.py b/meta/lib/oeqa/selftest/cases/manifest.py
index c0b25ab5d8..5d13f35468 100644
--- a/meta/lib/oeqa/selftest/cases/manifest.py
+++ b/meta/lib/oeqa/selftest/cases/manifest.py
@@ -86,11 +86,8 @@ class VerifyManifest(OESelftestTestCase):
86 try: 86 try:
87 mdir = self.get_dir_from_bb_var('SDK_DEPLOY', self.buildtarget) 87 mdir = self.get_dir_from_bb_var('SDK_DEPLOY', self.buildtarget)
88 for k in d_target.keys(): 88 for k in d_target.keys():
89 bb_vars = get_bb_vars(['SDK_NAME', 'SDK_VERSION'], self.buildtarget) 89 toolchain_outputname = get_bb_var('TOOLCHAIN_OUTPUTNAME', self.buildtarget)
90 mfilename[k] = "{}-toolchain-{}.{}.manifest".format( 90 mfilename[k] = "{}.{}.manifest".format(toolchain_outputname, k)
91 bb_vars['SDK_NAME'],
92 bb_vars['SDK_VERSION'],
93 k)
94 mpath[k] = os.path.join(mdir, mfilename[k]) 91 mpath[k] = os.path.join(mdir, mfilename[k])
95 if not os.path.isfile(mpath[k]): 92 if not os.path.isfile(mpath[k]):
96 self.logger.debug("{}: {} does not exist".format( 93 self.logger.debug("{}: {} does not exist".format(