diff options
Diffstat (limited to 'meta/lib')
-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 ad878571b5..9d1e801117 100644 --- a/meta/lib/oeqa/selftest/cases/incompatible_lic.py +++ b/meta/lib/oeqa/selftest/cases/incompatible_lic.py | |||
@@ -4,7 +4,7 @@ from oeqa.utils.commands import bitbake | |||
4 | class IncompatibleLicenseTests(OESelftestTestCase): | 4 | class IncompatibleLicenseTests(OESelftestTestCase): |
5 | 5 | ||
6 | def lic_test(self, pn, pn_lic, lic): | 6 | def lic_test(self, pn, pn_lic, lic): |
7 | error_msg = 'ERROR: Nothing PROVIDES \'%s\'\n%s was skipped: it has an incompatible license: %s' % (pn, pn, pn_lic) | 7 | error_msg = 'ERROR: Nothing PROVIDES \'%s\'\n%s was skipped: it has incompatible license(s): %s' % (pn, pn, pn_lic) |
8 | 8 | ||
9 | self.write_config("INCOMPATIBLE_LICENSE += \"%s\"" % (lic)) | 9 | self.write_config("INCOMPATIBLE_LICENSE += \"%s\"" % (lic)) |
10 | 10 | ||
@@ -27,12 +27,12 @@ class IncompatibleLicenseTests(OESelftestTestCase): | |||
27 | # license cannot be built when INCOMPATIBLE_LICENSE contains this SPDX | 27 | # license cannot be built when INCOMPATIBLE_LICENSE contains this SPDX |
28 | # license | 28 | # license |
29 | def test_incompatible_spdx_license_alias(self): | 29 | def test_incompatible_spdx_license_alias(self): |
30 | self.lic_test('incompatible-license-alias', 'GPLv3', 'GPL-3.0') | 30 | self.lic_test('incompatible-license-alias', 'GPL-3.0', 'GPL-3.0') |
31 | 31 | ||
32 | # Verify that a package with an alias (from SPDXLICENSEMAP) to an SPDX | 32 | # Verify that a package with an alias (from SPDXLICENSEMAP) to an SPDX |
33 | # license cannot be built when INCOMPATIBLE_LICENSE contains this alias | 33 | # license cannot be built when INCOMPATIBLE_LICENSE contains this alias |
34 | def test_incompatible_alias_spdx_license_alias(self): | 34 | def test_incompatible_alias_spdx_license_alias(self): |
35 | self.lic_test('incompatible-license-alias', 'GPLv3', 'GPLv3') | 35 | self.lic_test('incompatible-license-alias', 'GPL-3.0', 'GPLv3') |
36 | 36 | ||
37 | # Verify that a package with a non-SPDX license (neither in | 37 | # Verify that a package with a non-SPDX license (neither in |
38 | # AVAILABLE_LICENSES nor in SPDXLICENSEMAP) cannot be built when | 38 | # AVAILABLE_LICENSES nor in SPDXLICENSEMAP) cannot be built when |