From ad89c3254cc6c06026f1bebe23ec3717c1546633 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Wed, 7 Oct 2020 19:21:51 +0100 Subject: selftest: add test for recipes with patches in overrides devtool doesn't quite behave right when a recipe has patches applied in overrides, so add a test case to exercise that behaviour. Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- .../recipes-test/devtool/devtool-patch-overrides.bb | 8 ++++++++ .../devtool-patch-overrides/qemuarm/arm.patch | 5 +++++ .../devtool-patch-overrides/qemux86/x86.patch | 5 +++++ .../devtool/devtool-patch-overrides/source | 1 + meta/lib/oeqa/selftest/cases/devtool.py | 20 ++++++++++++++++++++ 5 files changed, 39 insertions(+) create mode 100644 meta-selftest/recipes-test/devtool/devtool-patch-overrides.bb create mode 100644 meta-selftest/recipes-test/devtool/devtool-patch-overrides/qemuarm/arm.patch create mode 100644 meta-selftest/recipes-test/devtool/devtool-patch-overrides/qemux86/x86.patch create mode 100644 meta-selftest/recipes-test/devtool/devtool-patch-overrides/source diff --git a/meta-selftest/recipes-test/devtool/devtool-patch-overrides.bb b/meta-selftest/recipes-test/devtool/devtool-patch-overrides.bb new file mode 100644 index 0000000000..d36c9edee4 --- /dev/null +++ b/meta-selftest/recipes-test/devtool/devtool-patch-overrides.bb @@ -0,0 +1,8 @@ +SUMMARY = "devtool test for overrides and patches" +LICENSE = "CLOSED" +INHIBIT_DEFAULT_DEPS = "1" +EXCLUDE_FROM_WORLD = "1" + +SRC_URI = "file://source;subdir=${BP}" +SRC_URI_append_qemuarm = " file://arm.patch;striplevel=0" +SRC_URI_append_qemux86 = " file://x86.patch;striplevel=0" diff --git a/meta-selftest/recipes-test/devtool/devtool-patch-overrides/qemuarm/arm.patch b/meta-selftest/recipes-test/devtool/devtool-patch-overrides/qemuarm/arm.patch new file mode 100644 index 0000000000..e33a2753f9 --- /dev/null +++ b/meta-selftest/recipes-test/devtool/devtool-patch-overrides/qemuarm/arm.patch @@ -0,0 +1,5 @@ +--- source.orig 2020-10-06 13:26:10.792688630 +0100 ++++ source 2020-10-06 13:26:18.853424694 +0100 +@@ -1 +1 @@ +-This is a test for something ++This is a test for qemuarm diff --git a/meta-selftest/recipes-test/devtool/devtool-patch-overrides/qemux86/x86.patch b/meta-selftest/recipes-test/devtool/devtool-patch-overrides/qemux86/x86.patch new file mode 100644 index 0000000000..1a0a175fa8 --- /dev/null +++ b/meta-selftest/recipes-test/devtool/devtool-patch-overrides/qemux86/x86.patch @@ -0,0 +1,5 @@ +--- source.orig 2020-10-06 13:26:10.792688630 +0100 ++++ source 2020-10-06 13:26:18.853424694 +0100 +@@ -1 +1 @@ +-This is a test for something ++This is a test for qemux86 diff --git a/meta-selftest/recipes-test/devtool/devtool-patch-overrides/source b/meta-selftest/recipes-test/devtool/devtool-patch-overrides/source new file mode 100644 index 0000000000..cc14ce627c --- /dev/null +++ b/meta-selftest/recipes-test/devtool/devtool-patch-overrides/source @@ -0,0 +1 @@ +This is a test for something diff --git a/meta/lib/oeqa/selftest/cases/devtool.py b/meta/lib/oeqa/selftest/cases/devtool.py index 2c9ff7a95a..0185e670ad 100644 --- a/meta/lib/oeqa/selftest/cases/devtool.py +++ b/meta/lib/oeqa/selftest/cases/devtool.py @@ -784,6 +784,26 @@ class DevtoolModifyTests(DevtoolBase): self._check_src_repo(tempdir) # This is probably sufficient + def test_devtool_modify_overrides(self): + # Try modifying a recipe with patches in overrides + tempdir = tempfile.mkdtemp(prefix='devtoolqa') + self.track_for_cleanup(tempdir) + self.track_for_cleanup(self.workspacedir) + self.add_command_to_tearDown('bitbake-layers remove-layer */workspace') + result = runCmd('devtool modify devtool-patch-overrides -x %s' % (tempdir)) + + self._check_src_repo(tempdir) + source = os.path.join(tempdir, "source") + def check(branch, expected): + runCmd('git -C %s checkout %s' % (tempdir, branch)) + with open(source, "rt") as f: + content = f.read() + self.assertEquals(content, expected) + check('devtool', 'This is a test for something\n') + check('devtool-no-overrides', 'This is a test for something\n') + check('devtool-override-qemuarm', 'This is a test for qemuarm\n') + check('devtool-override-qemux86', 'This is a test for qemux86\n') + class DevtoolUpdateTests(DevtoolBase): def test_devtool_update_recipe(self): -- cgit 1.2.3-korg