summaryrefslogtreecommitdiffstats
path: root/meta-selftest
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2021-02-18 15:16:04 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-02-21 22:01:28 +0000
commitd54cada0629176ba916ad48103cbb62436561062 (patch)
tree8b4558526e7a0eec96384c74604e8c360fa1bef4 /meta-selftest
parent3266d1ee1c02312a9b6c62a50d1f7bbc2863446f (diff)
downloadpoky-d54cada0629176ba916ad48103cbb62436561062.tar.gz
selftest/incompatible_lic: Update the tests after the 'or-later' license handling changes
With the separate of the "-only" and "-or-later" licenses, we need to update the tests to match the messages now given in the output. Also use a mix of canonicalised and non-canonlised names in the reference recipes to help test those cases and ensure coverage. (From OE-Core rev: b7f38af7ac9449178c603c5349808b8c0dd84d35) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta-selftest')
-rw-r--r--meta-selftest/recipes-test/license/incompatible-license.bb2
-rw-r--r--meta-selftest/recipes-test/license/incompatible-licenses.bb2
2 files changed, 2 insertions, 2 deletions
diff --git a/meta-selftest/recipes-test/license/incompatible-license.bb b/meta-selftest/recipes-test/license/incompatible-license.bb
index 1728ad76b7..282f5c2875 100644
--- a/meta-selftest/recipes-test/license/incompatible-license.bb
+++ b/meta-selftest/recipes-test/license/incompatible-license.bb
@@ -1,3 +1,3 @@
1SUMMARY = "Recipe with an SPDX license" 1SUMMARY = "Recipe with an SPDX license"
2DESCRIPTION = "Is licensed with an SPDX license to be used for testing" 2DESCRIPTION = "Is licensed with an SPDX license to be used for testing"
3LICENSE = "GPL-3.0" 3LICENSE = "GPL-3.0-only"
diff --git a/meta-selftest/recipes-test/license/incompatible-licenses.bb b/meta-selftest/recipes-test/license/incompatible-licenses.bb
index 9c1545efba..ab3b58d2c9 100644
--- a/meta-selftest/recipes-test/license/incompatible-licenses.bb
+++ b/meta-selftest/recipes-test/license/incompatible-licenses.bb
@@ -1,3 +1,3 @@
1SUMMARY = "Recipe with multiple SPDX licenses" 1SUMMARY = "Recipe with multiple SPDX licenses"
2DESCRIPTION = "Is licensed with multiple SPDX licenses to be used for testing" 2DESCRIPTION = "Is licensed with multiple SPDX licenses to be used for testing"
3LICENSE = "GPL-2.0 & GPL-3.0 & LGPL-3.0" 3LICENSE = "GPL-2.0-only & GPL-3.0 & LGPL-3.0-only"