diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-07-12 12:40:35 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-07-13 23:28:31 +0100 |
| commit | d153bd264ce4ee7a3e1da32a62ad58ed8146a570 (patch) | |
| tree | f9ad35ea9ba49e0418f84ebaa08d75e59f69a4e6 /meta | |
| parent | 020b1e81164995646e3036827268de35d2e79946 (diff) | |
| download | poky-d153bd264ce4ee7a3e1da32a62ad58ed8146a570.tar.gz | |
oeqa/selftest/incompatible_lic: Ensure tests work with ERROR_QA changes
Recent changes to ERROR_QA meant that the build was failing in ways the test
wasn't expecting. Tweak the tests to ensure those failures don't impact the test.
(From OE-Core rev: c206a87f2e7128308e38a046b1dcd8cc43c91125)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/lib/oeqa/selftest/cases/incompatible_lic.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/lib/oeqa/selftest/cases/incompatible_lic.py b/meta/lib/oeqa/selftest/cases/incompatible_lic.py index f4af67a239..4c228de6a3 100644 --- a/meta/lib/oeqa/selftest/cases/incompatible_lic.py +++ b/meta/lib/oeqa/selftest/cases/incompatible_lic.py | |||
| @@ -114,7 +114,7 @@ INCOMPATIBLE_LICENSE:pn-core-image-minimal = "GPL-3.0* LGPL-3.0*" | |||
| 114 | 114 | ||
| 115 | def test_bash_and_license(self): | 115 | def test_bash_and_license(self): |
| 116 | self.disable_class("create-spdx") | 116 | self.disable_class("create-spdx") |
| 117 | self.write_config(self.default_config() + '\nLICENSE:append:pn-bash = " & SomeLicense"') | 117 | self.write_config(self.default_config() + '\nLICENSE:append:pn-bash = " & SomeLicense"\nERROR_QA:remove = "license-exists"') |
| 118 | error_msg = "ERROR: core-image-minimal-1.0-r0 do_rootfs: Package bash cannot be installed into the image because it has incompatible license(s): GPL-3.0-or-later" | 118 | error_msg = "ERROR: core-image-minimal-1.0-r0 do_rootfs: Package bash cannot be installed into the image because it has incompatible license(s): GPL-3.0-or-later" |
| 119 | 119 | ||
| 120 | result = bitbake('core-image-minimal', ignore_status=True) | 120 | result = bitbake('core-image-minimal', ignore_status=True) |
| @@ -123,12 +123,12 @@ INCOMPATIBLE_LICENSE:pn-core-image-minimal = "GPL-3.0* LGPL-3.0*" | |||
| 123 | 123 | ||
| 124 | def test_bash_or_license(self): | 124 | def test_bash_or_license(self): |
| 125 | self.disable_class("create-spdx") | 125 | self.disable_class("create-spdx") |
| 126 | self.write_config(self.default_config() + '\nLICENSE:append:pn-bash = " | SomeLicense"') | 126 | self.write_config(self.default_config() + '\nLICENSE:append:pn-bash = " | SomeLicense"\nERROR_QA:remove = "license-exists license-file-missing"') |
| 127 | 127 | ||
| 128 | bitbake('core-image-minimal') | 128 | bitbake('core-image-minimal') |
| 129 | 129 | ||
| 130 | def test_bash_license_exceptions(self): | 130 | def test_bash_license_exceptions(self): |
| 131 | self.write_config(self.default_config() + '\nINCOMPATIBLE_LICENSE_EXCEPTIONS:pn-core-image-minimal = "bash:GPL-3.0-or-later"') | 131 | self.write_config(self.default_config() + '\nINCOMPATIBLE_LICENSE_EXCEPTIONS:pn-core-image-minimal = "bash:GPL-3.0-or-later"\nERROR_QA:remove = "license-incompatible"') |
| 132 | 132 | ||
| 133 | bitbake('core-image-minimal') | 133 | bitbake('core-image-minimal') |
| 134 | 134 | ||