Since we are skipping the merge test, two of the selftests now report
SKIP instead of XPASS/XFAIL as expected. Adjust the two files to have
the right endings for XSKIP, and add the category so that it can be used
for more extensive testing in the future.
Signed-off-by: Trevor Gamblin <tgamb...@baylibre.com>
---
...ad.pass => Merge.test_series_merge_on_head.1.skip} | 0
...ad.fail => Merge.test_series_merge_on_head.2.skip} | 0
meta/lib/patchtest/selftest/selftest | 11 ++++++++---
3 files changed, 8 insertions(+), 3 deletions(-)
rename meta/lib/patchtest/selftest/files/{Merge.test_series_merge_on_head.pass
=> Merge.test_series_merge_on_head.1.skip} (100%)
rename meta/lib/patchtest/selftest/files/{Merge.test_series_merge_on_head.fail
=> Merge.test_series_merge_on_head.2.skip} (100%)
diff --git
a/meta/lib/patchtest/selftest/files/Merge.test_series_merge_on_head.pass
b/meta/lib/patchtest/selftest/files/Merge.test_series_merge_on_head.1.skip
similarity index 100%
rename from
meta/lib/patchtest/selftest/files/Merge.test_series_merge_on_head.pass
rename to
meta/lib/patchtest/selftest/files/Merge.test_series_merge_on_head.1.skip
diff --git
a/meta/lib/patchtest/selftest/files/Merge.test_series_merge_on_head.fail
b/meta/lib/patchtest/selftest/files/Merge.test_series_merge_on_head.2.skip
similarity index 100%
rename from
meta/lib/patchtest/selftest/files/Merge.test_series_merge_on_head.fail
rename to
meta/lib/patchtest/selftest/files/Merge.test_series_merge_on_head.2.skip
diff --git a/meta/lib/patchtest/selftest/selftest
b/meta/lib/patchtest/selftest/selftest
index 006d1badf83..6fad50ce616 100755
--- a/meta/lib/patchtest/selftest/selftest
+++ b/meta/lib/patchtest/selftest/selftest
@@ -18,14 +18,15 @@ parentdir = os.path.dirname(topdir)
# path to the repo root
repodir = os.path.dirname(os.path.dirname(parentdir))
-def print_results(passcount, skipcount, failcount, xpasscount, xfailcount,
errorcount):
- total = passcount + skipcount + failcount + xpasscount + xfailcount +
errorcount
+def print_results(passcount, failcount, skipcount, xpasscount, xfailcount,
xskipcount, errorcount):
+ total = passcount + skipcount + failcount + xpasscount + xfailcount +
xskipcount + errorcount
print("============================================================================")
print("Testsuite summary for %s" % os.path.basename(topdir))
print("============================================================================")
print("# TOTAL: %s" % str(total))
print("# XPASS: %s" % str(xpasscount))
print("# XFAIL: %s" % str(xfailcount))
+ print("# XSKIP: %s" % str(xskipcount))
print("# PASS: %s" % str(passcount))
print("# FAIL: %s" % str(failcount))
print("# SKIP: %s" % str(skipcount))
@@ -48,6 +49,7 @@ if __name__ == '__main__':
skipcount = 0
xpasscount = 0
xfailcount = 0
+ xskipcount = 0
errorcount = 0
results = None
@@ -71,6 +73,9 @@ if __name__ == '__main__':
elif expected_result.upper() == "PASS" and result.upper()
== "PASS":
xpasscount = xpasscount + 1
print("XPASS: %s (file: %s)" % (testid.strip("."),
os.path.basename(patch)))
+ elif expected_result.upper() == "SKIP" and result.upper()
== "SKIP":
+ xskipcount = xskipcount + 1
+ print("XSKIP: %s (file: %s)" % (testid.strip("."),
os.path.basename(patch)))
else:
print("%s: %s (%s)" % (result.upper(),
testid.strip("."), os.path.basename(patch)))
if result.upper() == "PASS":
@@ -86,4 +91,4 @@ if __name__ == '__main__':
else:
print ("No test for=%s" % patch)
- print_results(passcount, skipcount, failcount, xpasscount, xfailcount,
errorcount)
+ print_results(passcount, failcount, skipcount, xpasscount, xfailcount,
xskipcount, errorcount)
--
2.41.0
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#189692):
https://lists.openembedded.org/g/openembedded-core/message/189692
Mute This Topic: https://lists.openembedded.org/mt/102182400/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
