diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-07-30 13:47:00 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-08-02 15:44:10 +0100 |
| commit | 2d7cf6c056691b6de81bdbb029225d7e0e16f37b (patch) | |
| tree | 3c3c0abaa8c1e40946b445de659d4fd339d335de /bitbake/lib/bb/tests/parse.py | |
| parent | 2abf8a699edd513405befbd1a0eafc8f55d6b514 (diff) | |
| download | poky-2d7cf6c056691b6de81bdbb029225d7e0e16f37b.tar.gz | |
bitbake: doc/lib: Update to use new override syntax containing colons
This runs the overrides conversion script in OE-Core over the bitbake code
base including the docs. A handful of things were excluded in toaster
and for the Changelog file.
(Bitbake rev: 47f8d3b24fd52381bf3b41e2f55a53e57841344c)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/tests/parse.py')
| -rw-r--r-- | bitbake/lib/bb/tests/parse.py | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/bitbake/lib/bb/tests/parse.py b/bitbake/lib/bb/tests/parse.py index 9e21e18425..02a5c4952a 100644 --- a/bitbake/lib/bb/tests/parse.py +++ b/bitbake/lib/bb/tests/parse.py | |||
| @@ -98,8 +98,8 @@ exportD = "d" | |||
| 98 | 98 | ||
| 99 | 99 | ||
| 100 | overridetest = """ | 100 | overridetest = """ |
| 101 | RRECOMMENDS_${PN} = "a" | 101 | RRECOMMENDS:${PN} = "a" |
| 102 | RRECOMMENDS_${PN}_libc = "b" | 102 | RRECOMMENDS:${PN}_libc = "b" |
| 103 | OVERRIDES = "libc:${PN}" | 103 | OVERRIDES = "libc:${PN}" |
| 104 | PN = "gtk+" | 104 | PN = "gtk+" |
| 105 | """ | 105 | """ |
| @@ -110,13 +110,13 @@ PN = "gtk+" | |||
| 110 | self.assertEqual(d.getVar("RRECOMMENDS"), "b") | 110 | self.assertEqual(d.getVar("RRECOMMENDS"), "b") |
| 111 | bb.data.expandKeys(d) | 111 | bb.data.expandKeys(d) |
| 112 | self.assertEqual(d.getVar("RRECOMMENDS"), "b") | 112 | self.assertEqual(d.getVar("RRECOMMENDS"), "b") |
| 113 | d.setVar("RRECOMMENDS_gtk+", "c") | 113 | d.setVar("RRECOMMENDS:gtk+", "c") |
| 114 | self.assertEqual(d.getVar("RRECOMMENDS"), "c") | 114 | self.assertEqual(d.getVar("RRECOMMENDS"), "c") |
| 115 | 115 | ||
| 116 | overridetest2 = """ | 116 | overridetest2 = """ |
| 117 | EXTRA_OECONF = "" | 117 | EXTRA_OECONF = "" |
| 118 | EXTRA_OECONF_class-target = "b" | 118 | EXTRA_OECONF:class-target = "b" |
| 119 | EXTRA_OECONF_append = " c" | 119 | EXTRA_OECONF:append = " c" |
| 120 | """ | 120 | """ |
| 121 | 121 | ||
| 122 | def test_parse_overrides(self): | 122 | def test_parse_overrides(self): |
| @@ -128,7 +128,7 @@ EXTRA_OECONF_append = " c" | |||
| 128 | 128 | ||
| 129 | overridetest3 = """ | 129 | overridetest3 = """ |
| 130 | DESCRIPTION = "A" | 130 | DESCRIPTION = "A" |
| 131 | DESCRIPTION_${PN}-dev = "${DESCRIPTION} B" | 131 | DESCRIPTION:${PN}-dev = "${DESCRIPTION} B" |
| 132 | PN = "bc" | 132 | PN = "bc" |
| 133 | """ | 133 | """ |
| 134 | 134 | ||
| @@ -136,9 +136,9 @@ PN = "bc" | |||
| 136 | f = self.parsehelper(self.overridetest3) | 136 | f = self.parsehelper(self.overridetest3) |
| 137 | d = bb.parse.handle(f.name, self.d)[''] | 137 | d = bb.parse.handle(f.name, self.d)[''] |
| 138 | bb.data.expandKeys(d) | 138 | bb.data.expandKeys(d) |
| 139 | self.assertEqual(d.getVar("DESCRIPTION_bc-dev"), "A B") | 139 | self.assertEqual(d.getVar("DESCRIPTION:bc-dev"), "A B") |
| 140 | d.setVar("DESCRIPTION", "E") | 140 | d.setVar("DESCRIPTION", "E") |
| 141 | d.setVar("DESCRIPTION_bc-dev", "C D") | 141 | d.setVar("DESCRIPTION:bc-dev", "C D") |
| 142 | d.setVar("OVERRIDES", "bc-dev") | 142 | d.setVar("OVERRIDES", "bc-dev") |
| 143 | self.assertEqual(d.getVar("DESCRIPTION"), "C D") | 143 | self.assertEqual(d.getVar("DESCRIPTION"), "C D") |
| 144 | 144 | ||
