aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNathan Rossi <nathan@nathanrossi.com>2019-09-07 12:55:06 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-09-07 21:52:27 +0100
commit6a1b0c2003a0b4a1983f9494440e6ea02dc25585 (patch)
tree34329aa16f5aa02c2a154a674a1d23d75290b8b1
parent0becf9c1fabb080a2481ebdacef6221f52301621 (diff)
downloadopenembedded-core-contrib-6a1b0c2003a0b4a1983f9494440e6ea02dc25585.tar.gz
openembedded-core-contrib-6a1b0c2003a0b4a1983f9494440e6ea02dc25585.tar.bz2
openembedded-core-contrib-6a1b0c2003a0b4a1983f9494440e6ea02dc25585.zip
oeqa/selftest: Use extraresults on self instead of self.tc
In order to take advantage of multiprocess execution of tests the extraresults must be passed through the TestResult. With changes to how oeqa/core handles test cases the extraresults attribute of the testcase is passed to the TestResult, with passing across process boundaries handled automatically. 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/binutils.py13
-rw-r--r--meta/lib/oeqa/selftest/cases/gcc.py14
-rw-r--r--meta/lib/oeqa/selftest/cases/glibc.py13
-rw-r--r--meta/lib/oeqa/selftest/cases/reproducible.py13
4 files changed, 12 insertions, 41 deletions
diff --git a/meta/lib/oeqa/selftest/cases/binutils.py b/meta/lib/oeqa/selftest/cases/binutils.py
index 7f887959e4..759cd9b8ff 100644
--- a/meta/lib/oeqa/selftest/cases/binutils.py
+++ b/meta/lib/oeqa/selftest/cases/binutils.py
@@ -16,15 +16,6 @@ def parse_values(content):
@OETestTag("machine")
class BinutilsCrossSelfTest(OESelftestTestCase):
- @classmethod
- def setUpClass(cls):
- super().setUpClass()
- if not hasattr(cls.tc, "extraresults"):
- cls.tc.extraresults = {}
-
- if "ptestresult.sections" not in cls.tc.extraresults:
- cls.tc.extraresults["ptestresult.sections"] = {}
-
def test_binutils(self):
self.run_binutils("binutils")
@@ -46,7 +37,7 @@ class BinutilsCrossSelfTest(OESelftestTestCase):
bitbake("{0} -c check".format(recipe))
ptestsuite = "binutils-{}".format(suite) if suite != "binutils" else suite
- self.tc.extraresults["ptestresult.sections"][ptestsuite] = {}
+ self.extraresults = {"ptestresult.sections" : {ptestsuite : {}}}
sumspath = os.path.join(builddir, suite, "{0}.sum".format(suite))
if not os.path.exists(sumspath):
@@ -54,5 +45,5 @@ class BinutilsCrossSelfTest(OESelftestTestCase):
with open(sumspath, "r") as f:
for test, result in parse_values(f):
- self.tc.extraresults["ptestresult.{}.{}".format(ptestsuite, test)] = {"status" : result}
+ self.extraresults["ptestresult.{}.{}".format(ptestsuite, test)] = {"status" : result}
diff --git a/meta/lib/oeqa/selftest/cases/gcc.py b/meta/lib/oeqa/selftest/cases/gcc.py
index f4fed40ea5..24ee66a2ae 100644
--- a/meta/lib/oeqa/selftest/cases/gcc.py
+++ b/meta/lib/oeqa/selftest/cases/gcc.py
@@ -13,15 +13,6 @@ def parse_values(content):
@OETestTag("machine")
class GccSelfTest(OESelftestTestCase):
- @classmethod
- def setUpClass(cls):
- super().setUpClass()
- if not hasattr(cls.tc, "extraresults"):
- cls.tc.extraresults = {}
-
- if "ptestresult.sections" not in cls.tc.extraresults:
- cls.tc.extraresults["ptestresult.sections"] = {}
-
def gcc_runtime_check_skip(self, suite):
targets = get_bb_var("RUNTIMETARGET", "gcc-runtime").split()
if suite not in targets:
@@ -71,6 +62,7 @@ class GccSelfTest(OESelftestTestCase):
bb_vars = get_bb_vars(["B", "TARGET_SYS"], recipe)
builddir, target_sys = bb_vars["B"], bb_vars["TARGET_SYS"]
+ self.extraresults = {"ptestresult.sections" : {}}
for suite in suites:
sumspath = os.path.join(builddir, "gcc", "testsuite", suite, "{0}.sum".format(suite))
if not os.path.exists(sumspath): # check in target dirs
@@ -80,10 +72,10 @@ class GccSelfTest(OESelftestTestCase):
ptestsuite = "gcc-{}".format(suite) if suite != "gcc" else suite
ptestsuite = ptestsuite + "-user" if ssh is None else ptestsuite
- self.tc.extraresults["ptestresult.sections"][ptestsuite] = {}
+ self.extraresults["ptestresult.sections"][ptestsuite] = {}
with open(sumspath, "r") as f:
for test, result in parse_values(f):
- self.tc.extraresults["ptestresult.{}.{}".format(ptestsuite, test)] = {"status" : result}
+ self.extraresults["ptestresult.{}.{}".format(ptestsuite, test)] = {"status" : result}
class GccSelfTestSystemEmulated(GccSelfTest):
default_installed_packages = ["libgcc", "libstdc++", "libatomic", "libgomp"]
diff --git a/meta/lib/oeqa/selftest/cases/glibc.py b/meta/lib/oeqa/selftest/cases/glibc.py
index 4d0c13131b..e13de87014 100644
--- a/meta/lib/oeqa/selftest/cases/glibc.py
+++ b/meta/lib/oeqa/selftest/cases/glibc.py
@@ -15,15 +15,6 @@ def parse_values(content):
@OETestTag("machine")
class GlibcSelfTest(OESelftestTestCase):
- @classmethod
- def setUpClass(cls):
- super().setUpClass()
- if not hasattr(cls.tc, "extraresults"):
- cls.tc.extraresults = {}
-
- if "ptestresult.sections" not in cls.tc.extraresults:
- cls.tc.extraresults["ptestresult.sections"] = {}
-
def test_glibc(self):
self.glibc_run_check()
@@ -44,10 +35,10 @@ class GlibcSelfTest(OESelftestTestCase):
builddir = get_bb_var("B", "glibc-testsuite")
ptestsuite = "glibc-user" if ssh is None else "glibc"
- self.tc.extraresults["ptestresult.sections"][ptestsuite] = {}
+ self.extraresults = {"ptestresult.sections" : {ptestsuite : {}}}
with open(os.path.join(builddir, "tests.sum"), "r") as f:
for test, result in parse_values(f):
- self.tc.extraresults["ptestresult.{}.{}".format(ptestsuite, test)] = {"status" : result}
+ self.extraresults["ptestresult.{}.{}".format(ptestsuite, test)] = {"status" : result}
class GlibcSelfTestSystemEmulated(GlibcSelfTest):
default_installed_packages = [
diff --git a/meta/lib/oeqa/selftest/cases/reproducible.py b/meta/lib/oeqa/selftest/cases/reproducible.py
index ffb405af20..eee09d3fb2 100644
--- a/meta/lib/oeqa/selftest/cases/reproducible.py
+++ b/meta/lib/oeqa/selftest/cases/reproducible.py
@@ -82,15 +82,12 @@ class ReproducibleTests(OESelftestTestCase):
for v in needed_vars:
setattr(self, v.lower(), bb_vars[v])
- if not hasattr(self.tc, "extraresults"):
- self.tc.extraresults = {}
- self.extras = self.tc.extraresults
-
- self.extras.setdefault('reproducible.rawlogs', {})['log'] = ''
- self.extras.setdefault('reproducible', {}).setdefault('files', {})
+ self.extrasresults = {}
+ self.extrasresults.setdefault('reproducible.rawlogs', {})['log'] = ''
+ self.extrasresults.setdefault('reproducible', {}).setdefault('files', {})
def append_to_log(self, msg):
- self.extras['reproducible.rawlogs']['log'] += msg
+ self.extrasresults['reproducible.rawlogs']['log'] += msg
def compare_packages(self, reference_dir, test_dir, diffutils_sysroot):
result = PackageCompareResults()
@@ -117,7 +114,7 @@ class ReproducibleTests(OESelftestTestCase):
return result
def write_package_list(self, package_class, name, packages):
- self.extras['reproducible']['files'].setdefault(package_class, {})[name] = [
+ self.extrasresults['reproducible']['files'].setdefault(package_class, {})[name] = [
{'reference': p.reference, 'test': p.test} for p in packages]
def test_reproducible_builds(self):