diff options
author | Peter Kjellerstedt <peter.kjellerstedt@axis.com> | 2022-03-23 17:14:57 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-03-24 17:45:29 +0000 |
commit | d01b1919dc2e2dfba0cc4037d7cc5bed026d7455 (patch) | |
tree | 8bb66c89c5ab920d2e64f2f1d44fccf247315252 /meta/lib/oeqa | |
parent | e3c002527a2d88875ee5ca294c04910f778459f6 (diff) | |
download | poky-d01b1919dc2e2dfba0cc4037d7cc5bed026d7455.tar.gz |
selftest/incompatible_lic: Remove references to AVAILABLE_LICENSES
The AVAILABLE_LICENSES variable has been removed from OE-Core.
(From OE-Core rev: bf4a7eee09245c0f7f8939f4cd522646fec6e507)
Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oeqa')
-rw-r--r-- | meta/lib/oeqa/selftest/cases/incompatible_lic.py | 40 |
1 files changed, 18 insertions, 22 deletions
diff --git a/meta/lib/oeqa/selftest/cases/incompatible_lic.py b/meta/lib/oeqa/selftest/cases/incompatible_lic.py index 0794d46e6d..6279d74245 100644 --- a/meta/lib/oeqa/selftest/cases/incompatible_lic.py +++ b/meta/lib/oeqa/selftest/cases/incompatible_lic.py | |||
@@ -13,15 +13,15 @@ class IncompatibleLicenseTestObsolete(OESelftestTestCase): | |||
13 | if error_msg not in result.output: | 13 | if error_msg not in result.output: |
14 | raise AssertionError(result.output) | 14 | raise AssertionError(result.output) |
15 | 15 | ||
16 | # Verify that a package with an SPDX license (from AVAILABLE_LICENSES) | 16 | # Verify that a package with an SPDX license cannot be built when |
17 | # cannot be built when INCOMPATIBLE_LICENSE contains an alias (in | 17 | # INCOMPATIBLE_LICENSE contains an alias (in SPDXLICENSEMAP) of this SPDX |
18 | # SPDXLICENSEMAP) of this SPDX license | 18 | # license |
19 | def test_incompatible_alias_spdx_license(self): | 19 | def test_incompatible_alias_spdx_license(self): |
20 | self.lic_test('incompatible-license', 'GPL-3.0-only', 'GPLv3', "is an obsolete license, please use an SPDX reference in INCOMPATIBLE_LICENSE") | 20 | self.lic_test('incompatible-license', 'GPL-3.0-only', 'GPLv3', "is an obsolete license, please use an SPDX reference in INCOMPATIBLE_LICENSE") |
21 | 21 | ||
22 | # Verify that a package with an SPDX license (from AVAILABLE_LICENSES) | 22 | # Verify that a package with an SPDX license cannot be built when |
23 | # cannot be built when INCOMPATIBLE_LICENSE contains a wildcarded alias | 23 | # INCOMPATIBLE_LICENSE contains a wildcarded alias license matching this |
24 | # license matching this SPDX license | 24 | # SPDX license |
25 | def test_incompatible_alias_spdx_license_wildcard(self): | 25 | def test_incompatible_alias_spdx_license_wildcard(self): |
26 | self.lic_test('incompatible-license', 'GPL-3.0-only', '*GPLv3', "*GPLv3 is an invalid license wildcard entry") | 26 | self.lic_test('incompatible-license', 'GPL-3.0-only', '*GPLv3', "*GPLv3 is an invalid license wildcard entry") |
27 | 27 | ||
@@ -43,16 +43,14 @@ class IncompatibleLicenseTestObsolete(OESelftestTestCase): | |||
43 | self.lic_test('incompatible-license-alias', 'GPL-3.0-only', '*GPLv3', "*GPLv3 is an invalid license wildcard entry") | 43 | self.lic_test('incompatible-license-alias', 'GPL-3.0-only', '*GPLv3', "*GPLv3 is an invalid license wildcard entry") |
44 | 44 | ||
45 | 45 | ||
46 | # Verify that a package with multiple SPDX licenses (from | 46 | # Verify that a package with multiple SPDX licenses cannot be built when |
47 | # AVAILABLE_LICENSES) cannot be built when INCOMPATIBLE_LICENSE contains a | 47 | # INCOMPATIBLE_LICENSE contains a wildcard to some of them |
48 | # wildcard to some of them | ||
49 | def test_incompatible_spdx_licenses_wildcard(self): | 48 | def test_incompatible_spdx_licenses_wildcard(self): |
50 | self.lic_test('incompatible-licenses', 'GPL-3.0-only LGPL-3.0-only', '*GPL-3.0-only', "*GPL-3.0-only is an invalid license wildcard entry") | 49 | self.lic_test('incompatible-licenses', 'GPL-3.0-only LGPL-3.0-only', '*GPL-3.0-only', "*GPL-3.0-only is an invalid license wildcard entry") |
51 | 50 | ||
52 | 51 | ||
53 | # Verify that a package with multiple SPDX licenses (from | 52 | # Verify that a package with multiple SPDX licenses cannot be built when |
54 | # AVAILABLE_LICENSES) cannot be built when INCOMPATIBLE_LICENSE contains a | 53 | # INCOMPATIBLE_LICENSE contains a wildcard matching all licenses |
55 | # wildcard matching all licenses | ||
56 | def test_incompatible_all_licenses_wildcard(self): | 54 | def test_incompatible_all_licenses_wildcard(self): |
57 | self.lic_test('incompatible-licenses', 'GPL-2.0-only GPL-3.0-only LGPL-3.0-only', '*', "* is an invalid license wildcard entry") | 55 | self.lic_test('incompatible-licenses', 'GPL-2.0-only GPL-3.0-only LGPL-3.0-only', '*', "* is an invalid license wildcard entry") |
58 | 56 | ||
@@ -67,14 +65,14 @@ class IncompatibleLicenseTests(OESelftestTestCase): | |||
67 | if error_msg not in result.output: | 65 | if error_msg not in result.output: |
68 | raise AssertionError(result.output) | 66 | raise AssertionError(result.output) |
69 | 67 | ||
70 | # Verify that a package with an SPDX license (from AVAILABLE_LICENSES) | 68 | # Verify that a package with an SPDX license cannot be built when |
71 | # cannot be built when INCOMPATIBLE_LICENSE contains this SPDX license | 69 | # INCOMPATIBLE_LICENSE contains this SPDX license |
72 | def test_incompatible_spdx_license(self): | 70 | def test_incompatible_spdx_license(self): |
73 | self.lic_test('incompatible-license', 'GPL-3.0-only', 'GPL-3.0-only') | 71 | self.lic_test('incompatible-license', 'GPL-3.0-only', 'GPL-3.0-only') |
74 | 72 | ||
75 | # Verify that a package with an SPDX license (from AVAILABLE_LICENSES) | 73 | # Verify that a package with an SPDX license cannot be built when |
76 | # cannot be built when INCOMPATIBLE_LICENSE contains a wildcarded license | 74 | # INCOMPATIBLE_LICENSE contains a wildcarded license matching this SPDX |
77 | # matching this SPDX license | 75 | # license |
78 | def test_incompatible_spdx_license_wildcard(self): | 76 | def test_incompatible_spdx_license_wildcard(self): |
79 | self.lic_test('incompatible-license', 'GPL-3.0-only', 'GPL-3.0*') | 77 | self.lic_test('incompatible-license', 'GPL-3.0-only', 'GPL-3.0*') |
80 | 78 | ||
@@ -84,14 +82,12 @@ class IncompatibleLicenseTests(OESelftestTestCase): | |||
84 | def test_incompatible_spdx_license_alias(self): | 82 | def test_incompatible_spdx_license_alias(self): |
85 | self.lic_test('incompatible-license-alias', 'GPL-3.0-only', 'GPL-3.0-only') | 83 | self.lic_test('incompatible-license-alias', 'GPL-3.0-only', 'GPL-3.0-only') |
86 | 84 | ||
87 | # Verify that a package with multiple SPDX licenses (from | 85 | # Verify that a package with multiple SPDX licenses cannot be built when |
88 | # AVAILABLE_LICENSES) cannot be built when INCOMPATIBLE_LICENSE contains | 86 | # INCOMPATIBLE_LICENSE contains some of them |
89 | # some of them | ||
90 | def test_incompatible_spdx_licenses(self): | 87 | def test_incompatible_spdx_licenses(self): |
91 | self.lic_test('incompatible-licenses', 'GPL-3.0-only LGPL-3.0-only', 'GPL-3.0-only LGPL-3.0-only') | 88 | self.lic_test('incompatible-licenses', 'GPL-3.0-only LGPL-3.0-only', 'GPL-3.0-only LGPL-3.0-only') |
92 | 89 | ||
93 | # Verify that a package with a non-SPDX license (neither in | 90 | # Verify that a package with a non-SPDX license cannot be built when |
94 | # AVAILABLE_LICENSES nor in SPDXLICENSEMAP) cannot be built when | ||
95 | # INCOMPATIBLE_LICENSE contains this license | 91 | # INCOMPATIBLE_LICENSE contains this license |
96 | def test_incompatible_nonspdx_license(self): | 92 | def test_incompatible_nonspdx_license(self): |
97 | self.lic_test('incompatible-nonspdx-license', 'FooLicense', 'FooLicense') | 93 | self.lic_test('incompatible-nonspdx-license', 'FooLicense', 'FooLicense') |