From: Trevor Gamblin <tgamb...@baylibre.com>
Avoid testing mergeability of a patch when not targeting master, so that
patches tested via other means (e.g. maintainer branches and AB runs)
don't get unnecessarily reviewed an extra time.
Signed-off-by: Trevor Gamblin <tgamb...@baylibre.com>
Signed-off-by: Richard Purdie <richard.pur...@linuxfoundation.org>
(cherry picked from commit e6cf23e353f48c57249681bd0b12bd8494d4959a)
Signed-off-by: Steve Sakoman <st...@sakoman.com>
---
meta/lib/patchtest/tests/test_mbox_merge.py | 2 ++
1 file changed, 2 insertions(+)
diff --git a/meta/lib/patchtest/tests/test_mbox_merge.py
b/meta/lib/patchtest/tests/test_mbox_merge.py
index bc55c588b4..f69d57c71b 100644
--- a/meta/lib/patchtest/tests/test_mbox_merge.py
+++ b/meta/lib/patchtest/tests/test_mbox_merge.py
@@ -18,6 +18,8 @@ def headlog():
class Merge(base.Base):
def test_series_merge_on_head(self):
+ if PatchTestInput.repo.branch != "master":
+ self.skip("Skipping merge test since patch is not intended for
master branch. Target detected is %s" % PatchTestInput.repo.branch)
if not PatchTestInput.repo.ismerged:
commithash, author, date, shortlog = headlog()
self.fail('Series does not apply on top of target branch. Rebase
your series and ensure the target is correct',
--
2.34.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#190908):
https://lists.openembedded.org/g/openembedded-core/message/190908
Mute This Topic: https://lists.openembedded.org/mt/102710674/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
