diff options
author | Nathan Rossi <nathan@nathanrossi.com> | 2019-09-04 14:23:23 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-09-07 21:56:43 +0100 |
commit | 219c199d347a965d3abe486fc13f41d91df7c751 (patch) | |
tree | 290b54bbfbb9753ed89ddb3b4b735b3771b66f00 | |
parent | 2b67b9dfad46f39c101c28b567522ccbdbec71fd (diff) | |
download | poky-219c199d347a965d3abe486fc13f41d91df7c751.tar.gz |
oeqa/selftest: For toolchain tests do not fail if a test failed
Do not fail the running selftest test case if the test suite has a
failed test case. Currently toolchain tests suites (binutils, gcc,
glibc) fail but this does not indicate failure to execute the tests.
Also remove the logging of each test that failed.
(From OE-Core rev: 073575ff9c06b2791cc2bd88063d815d2220f038)
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.py | 6 | ||||
-rw-r--r-- | meta/lib/oeqa/selftest/cases/gcc.py | 6 | ||||
-rw-r--r-- | meta/lib/oeqa/selftest/cases/glibc.py | 5 |
3 files changed, 0 insertions, 17 deletions
diff --git a/meta/lib/oeqa/selftest/cases/binutils.py b/meta/lib/oeqa/selftest/cases/binutils.py index 4edee09390..7f887959e4 100644 --- a/meta/lib/oeqa/selftest/cases/binutils.py +++ b/meta/lib/oeqa/selftest/cases/binutils.py | |||
@@ -52,13 +52,7 @@ class BinutilsCrossSelfTest(OESelftestTestCase): | |||
52 | if not os.path.exists(sumspath): | 52 | if not os.path.exists(sumspath): |
53 | sumspath = os.path.join(builddir, suite, "testsuite", "{0}.sum".format(suite)) | 53 | sumspath = os.path.join(builddir, suite, "testsuite", "{0}.sum".format(suite)) |
54 | 54 | ||
55 | failed = 0 | ||
56 | with open(sumspath, "r") as f: | 55 | with open(sumspath, "r") as f: |
57 | for test, result in parse_values(f): | 56 | for test, result in parse_values(f): |
58 | self.tc.extraresults["ptestresult.{}.{}".format(ptestsuite, test)] = {"status" : result} | 57 | self.tc.extraresults["ptestresult.{}.{}".format(ptestsuite, test)] = {"status" : result} |
59 | if result == "FAIL": | ||
60 | self.logger.info("failed: '{}'".format(test)) | ||
61 | failed += 1 | ||
62 | |||
63 | self.assertEqual(failed, 0) | ||
64 | 58 | ||
diff --git a/meta/lib/oeqa/selftest/cases/gcc.py b/meta/lib/oeqa/selftest/cases/gcc.py index 0b0157e568..dba453f00a 100644 --- a/meta/lib/oeqa/selftest/cases/gcc.py +++ b/meta/lib/oeqa/selftest/cases/gcc.py | |||
@@ -71,7 +71,6 @@ class GccSelfTest(OESelftestTestCase): | |||
71 | bb_vars = get_bb_vars(["B", "TARGET_SYS"], recipe) | 71 | bb_vars = get_bb_vars(["B", "TARGET_SYS"], recipe) |
72 | builddir, target_sys = bb_vars["B"], bb_vars["TARGET_SYS"] | 72 | builddir, target_sys = bb_vars["B"], bb_vars["TARGET_SYS"] |
73 | 73 | ||
74 | failed = 0 | ||
75 | for suite in suites: | 74 | for suite in suites: |
76 | sumspath = os.path.join(builddir, "gcc", "testsuite", suite, "{0}.sum".format(suite)) | 75 | sumspath = os.path.join(builddir, "gcc", "testsuite", suite, "{0}.sum".format(suite)) |
77 | if not os.path.exists(sumspath): # check in target dirs | 76 | if not os.path.exists(sumspath): # check in target dirs |
@@ -84,11 +83,6 @@ class GccSelfTest(OESelftestTestCase): | |||
84 | with open(sumspath, "r") as f: | 83 | with open(sumspath, "r") as f: |
85 | for test, result in parse_values(f): | 84 | for test, result in parse_values(f): |
86 | self.tc.extraresults["ptestresult.{}.{}".format(ptestsuite, test)] = {"status" : result} | 85 | self.tc.extraresults["ptestresult.{}.{}".format(ptestsuite, test)] = {"status" : result} |
87 | if result == "FAIL": | ||
88 | self.logger.info("failed: '{}'".format(test)) | ||
89 | failed += 1 | ||
90 | |||
91 | self.assertEqual(failed, 0) | ||
92 | 86 | ||
93 | class GccSelfTestSystemEmulated(GccSelfTest): | 87 | class GccSelfTestSystemEmulated(GccSelfTest): |
94 | default_installed_packages = ["libgcc", "libstdc++", "libatomic", "libgomp"] | 88 | 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 6a34da39d9..7992ea6bf2 100644 --- a/meta/lib/oeqa/selftest/cases/glibc.py +++ b/meta/lib/oeqa/selftest/cases/glibc.py | |||
@@ -43,15 +43,10 @@ class GlibcSelfTest(OESelftestTestCase): | |||
43 | 43 | ||
44 | builddir = get_bb_var("B", "glibc-testsuite") | 44 | builddir = get_bb_var("B", "glibc-testsuite") |
45 | 45 | ||
46 | failed = 0 | ||
47 | self.tc.extraresults["ptestresult.sections"]["glibc"] = {} | 46 | self.tc.extraresults["ptestresult.sections"]["glibc"] = {} |
48 | with open(os.path.join(builddir, "tests.sum"), "r") as f: | 47 | with open(os.path.join(builddir, "tests.sum"), "r") as f: |
49 | for test, result in parse_values(f): | 48 | for test, result in parse_values(f): |
50 | self.tc.extraresults["ptestresult.glibc.{}".format(test)] = {"status" : result} | 49 | self.tc.extraresults["ptestresult.glibc.{}".format(test)] = {"status" : result} |
51 | if result == "FAIL": | ||
52 | self.logger.info("failed: '{}'".format(test)) | ||
53 | failed += 1 | ||
54 | self.assertEqual(failed, 0) | ||
55 | 50 | ||
56 | class GlibcSelfTestSystemEmulated(GlibcSelfTest): | 51 | class GlibcSelfTestSystemEmulated(GlibcSelfTest): |
57 | default_installed_packages = [ | 52 | default_installed_packages = [ |