diff options
Diffstat (limited to 'meta/lib/oeqa/selftest/cases/multiconfig.py')
-rw-r--r-- | meta/lib/oeqa/selftest/cases/multiconfig.py | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/meta/lib/oeqa/selftest/cases/multiconfig.py b/meta/lib/oeqa/selftest/cases/multiconfig.py index 39b92f2439..f509cbf607 100644 --- a/meta/lib/oeqa/selftest/cases/multiconfig.py +++ b/meta/lib/oeqa/selftest/cases/multiconfig.py | |||
@@ -1,4 +1,6 @@ | |||
1 | # | 1 | # |
2 | # Copyright OpenEmbedded Contributors | ||
3 | # | ||
2 | # SPDX-License-Identifier: MIT | 4 | # SPDX-License-Identifier: MIT |
3 | # | 5 | # |
4 | 6 | ||
@@ -17,7 +19,7 @@ class MultiConfig(OESelftestTestCase): | |||
17 | """ | 19 | """ |
18 | 20 | ||
19 | config = """ | 21 | config = """ |
20 | IMAGE_INSTALL_append_pn-core-image-full-cmdline = " multiconfig-image-packager-tiny multiconfig-image-packager-musl" | 22 | IMAGE_INSTALL:append:pn-core-image-full-cmdline = " multiconfig-image-packager-tiny multiconfig-image-packager-musl" |
21 | BBMULTICONFIG = "tiny musl" | 23 | BBMULTICONFIG = "tiny musl" |
22 | """ | 24 | """ |
23 | self.write_config(config) | 25 | self.write_config(config) |
@@ -52,7 +54,7 @@ TMPDIR = "${TOPDIR}/tmp-mc-tiny" | |||
52 | self.write_config(config) | 54 | self.write_config(config) |
53 | 55 | ||
54 | testconfig = textwrap.dedent('''\ | 56 | testconfig = textwrap.dedent('''\ |
55 | MCTESTVAR_append = "1" | 57 | MCTESTVAR:append = "1" |
56 | ''') | 58 | ''') |
57 | self.write_config(testconfig, 'test') | 59 | self.write_config(testconfig, 'test') |
58 | 60 | ||
@@ -64,9 +66,22 @@ TMPDIR = "${TOPDIR}/tmp-mc-tiny" | |||
64 | self.assertIn('MCTESTVAR=test1', result.output.splitlines()) | 66 | self.assertIn('MCTESTVAR=test1', result.output.splitlines()) |
65 | 67 | ||
66 | testconfig = textwrap.dedent('''\ | 68 | testconfig = textwrap.dedent('''\ |
67 | MCTESTVAR_append = "2" | 69 | MCTESTVAR:append = "2" |
68 | ''') | 70 | ''') |
69 | self.write_config(testconfig, 'test') | 71 | self.write_config(testconfig, 'test') |
70 | 72 | ||
71 | result = bitbake('mc:test:multiconfig-test-parse -c showvar') | 73 | result = bitbake('mc:test:multiconfig-test-parse -c showvar') |
72 | self.assertIn('MCTESTVAR=test2', result.output.splitlines()) | 74 | self.assertIn('MCTESTVAR=test2', result.output.splitlines()) |
75 | |||
76 | def test_multiconfig_inlayer(self): | ||
77 | """ | ||
78 | Test that a multiconfig from meta-selftest works. | ||
79 | """ | ||
80 | |||
81 | config = """ | ||
82 | BBMULTICONFIG = "muslmc" | ||
83 | """ | ||
84 | self.write_config(config) | ||
85 | |||
86 | # Build a core-image-minimal, only dry run needed to check config is present | ||
87 | bitbake('mc:muslmc:bash -n') | ||