diff options
author | Nathan Rossi <nathan@nathanrossi.com> | 2019-09-07 12:55:06 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-09-07 21:53:21 +0100 |
commit | 94bf24268108774e022ad247c647e48a781debbb (patch) | |
tree | 2279af9f1499983be87547c1ca255aed20f9b79a | |
parent | 7b2f03eff9fc9b4ce48d5ea7e54faa114a6cdcae (diff) | |
download | openembedded-core-contrib-94bf24268108774e022ad247c647e48a781debbb.tar.gz |
oeqa/selftest/cases/glibc.py: Rework and tag with toolchain-user/system
Rework the glibc execution into a common base class. Additionally tag
the tests with "toolchain-user" and "toolchain-system".
Signed-off-by: Nathan Rossi <nathan@nathanrossi.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/lib/oeqa/selftest/cases/glibc.py | 46 |
1 files changed, 25 insertions, 21 deletions
diff --git a/meta/lib/oeqa/selftest/cases/glibc.py b/meta/lib/oeqa/selftest/cases/glibc.py index e13de87014..2e42485dd6 100644 --- a/meta/lib/oeqa/selftest/cases/glibc.py +++ b/meta/lib/oeqa/selftest/cases/glibc.py @@ -13,12 +13,8 @@ def parse_values(content): yield i[len(v) + 2:].strip(), v break -@OETestTag("machine") -class GlibcSelfTest(OESelftestTestCase): - def test_glibc(self): - self.glibc_run_check() - - def glibc_run_check(self, ssh = None): +class GlibcSelfTestBase(OESelftestTestCase): + def run_check(self, ssh = None): # configure ssh target features = [] if ssh is not None: @@ -40,28 +36,26 @@ class GlibcSelfTest(OESelftestTestCase): for test, result in parse_values(f): self.extraresults["ptestresult.{}.{}".format(ptestsuite, test)] = {"status" : result} -class GlibcSelfTestSystemEmulated(GlibcSelfTest): - default_installed_packages = [ - "glibc-charmaps", - "libgcc", - "libstdc++", - "libatomic", - "libgomp", - # "python3", - # "python3-pexpect", - "nfs-utils", - ] - - def glibc_run_check(self): + def run_check_emulated(self): with contextlib.ExitStack() as s: # use the base work dir, as the nfs mount, since the recipe directory may not exist tmpdir = get_bb_var("BASE_WORKDIR") nfsport, mountport = s.enter_context(unfs_server(tmpdir)) # build core-image-minimal with required packages + default_installed_packages = [ + "glibc-charmaps", + "libgcc", + "libstdc++", + "libatomic", + "libgomp", + # "python3", + # "python3-pexpect", + "nfs-utils", + ] features = [] features.append('IMAGE_FEATURES += "ssh-server-openssh"') - features.append('CORE_IMAGE_EXTRA_INSTALL += "{0}"'.format(" ".join(self.default_installed_packages))) + features.append('CORE_IMAGE_EXTRA_INSTALL += "{0}"'.format(" ".join(default_installed_packages))) self.write_config("\n".join(features)) bitbake("core-image-minimal") @@ -80,5 +74,15 @@ class GlibcSelfTestSystemEmulated(GlibcSelfTest): if status != 0: raise Exception("Failed to setup NFS mount on target ({})".format(repr(output))) - super().glibc_run_check(ssh = qemu.ip) + self.run_check(ssh = qemu.ip) + +@OETestTag("toolchain-user") +class GlibcSelfTest(GlibcSelfTestBase): + def test_glibc(self): + self.run_check() + +@OETestTag("toolchain-system") +class GlibcSelfTestSystemEmulated(GlibcSelfTestBase): + def test_glibc(self): + self.run_check_emulated() |