diff options
author | Joshua Watt <JPEWhacker@gmail.com> | 2020-06-05 22:15:35 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-06-10 12:30:01 +0100 |
commit | c90dd50939b8de3330e3c27577f3503ef6f24f10 (patch) | |
tree | d80d50ff332bdfa878d6f925715298d7d56dc239 /bitbake/lib/bb/tests/runqueue-tests | |
parent | 59fb65f74293c5b2dba811b41f8e254d601f359b (diff) | |
download | poky-c90dd50939b8de3330e3c27577f3503ef6f24f10.tar.gz |
bitbake: bitbake: tests: Add tests for BBMASK in multiconfig
Adds a test to validate that multiconfigs can independently mask off
recipes by setting BBMASK. See the test description for further
information about how the test works.
(Bitbake rev: 513fc2dddf13d5e344162c26d89d2dde2fe85634)
Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/tests/runqueue-tests')
5 files changed, 13 insertions, 1 deletions
diff --git a/bitbake/lib/bb/tests/runqueue-tests/conf/bitbake.conf b/bitbake/lib/bb/tests/runqueue-tests/conf/bitbake.conf index 5e451fc2c0..efebf001a9 100644 --- a/bitbake/lib/bb/tests/runqueue-tests/conf/bitbake.conf +++ b/bitbake/lib/bb/tests/runqueue-tests/conf/bitbake.conf | |||
@@ -1,7 +1,8 @@ | |||
1 | CACHE = "${TOPDIR}/cache" | 1 | CACHE = "${TOPDIR}/cache" |
2 | THISDIR = "${@os.path.dirname(d.getVar('FILE'))}" | 2 | THISDIR = "${@os.path.dirname(d.getVar('FILE'))}" |
3 | COREBASE := "${@os.path.normpath(os.path.dirname(d.getVar('FILE')+'/../../'))}" | 3 | COREBASE := "${@os.path.normpath(os.path.dirname(d.getVar('FILE')+'/../../'))}" |
4 | BBFILES = "${COREBASE}/recipes/*.bb" | 4 | EXTRA_BBFILES ?= "" |
5 | BBFILES = "${COREBASE}/recipes/*.bb ${EXTRA_BBFILES}" | ||
5 | PROVIDES = "${PN}" | 6 | PROVIDES = "${PN}" |
6 | PN = "${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[0]}" | 7 | PN = "${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[0]}" |
7 | PF = "${BB_CURRENT_MC}:${PN}" | 8 | PF = "${BB_CURRENT_MC}:${PN}" |
diff --git a/bitbake/lib/bb/tests/runqueue-tests/conf/multiconfig/mc1.conf b/bitbake/lib/bb/tests/runqueue-tests/conf/multiconfig/mc1.conf index ecf23e1c73..f34b8dcccf 100644 --- a/bitbake/lib/bb/tests/runqueue-tests/conf/multiconfig/mc1.conf +++ b/bitbake/lib/bb/tests/runqueue-tests/conf/multiconfig/mc1.conf | |||
@@ -1 +1,2 @@ | |||
1 | TMPDIR = "${TOPDIR}/mc1/" | 1 | TMPDIR = "${TOPDIR}/mc1/" |
2 | BBMASK += "recipes/fails-mc/fails-mc1.bb" | ||
diff --git a/bitbake/lib/bb/tests/runqueue-tests/conf/multiconfig/mc2.conf b/bitbake/lib/bb/tests/runqueue-tests/conf/multiconfig/mc2.conf index eef338e4cc..c3360fc5c8 100644 --- a/bitbake/lib/bb/tests/runqueue-tests/conf/multiconfig/mc2.conf +++ b/bitbake/lib/bb/tests/runqueue-tests/conf/multiconfig/mc2.conf | |||
@@ -1 +1,2 @@ | |||
1 | TMPDIR = "${TOPDIR}/mc2/" | 1 | TMPDIR = "${TOPDIR}/mc2/" |
2 | BBMASK += "recipes/fails-mc/fails-mc2.bb" | ||
diff --git a/bitbake/lib/bb/tests/runqueue-tests/recipes/fails-mc/fails-mc1.bb b/bitbake/lib/bb/tests/runqueue-tests/recipes/fails-mc/fails-mc1.bb new file mode 100644 index 0000000000..17a181fffb --- /dev/null +++ b/bitbake/lib/bb/tests/runqueue-tests/recipes/fails-mc/fails-mc1.bb | |||
@@ -0,0 +1,5 @@ | |||
1 | python () { | ||
2 | if d.getVar("BB_CURRENT_MC") == "mc1": | ||
3 | bb.fatal("Multiconfig is mc1") | ||
4 | } | ||
5 | |||
diff --git a/bitbake/lib/bb/tests/runqueue-tests/recipes/fails-mc/fails-mc2.bb b/bitbake/lib/bb/tests/runqueue-tests/recipes/fails-mc/fails-mc2.bb new file mode 100644 index 0000000000..cc69e7b82d --- /dev/null +++ b/bitbake/lib/bb/tests/runqueue-tests/recipes/fails-mc/fails-mc2.bb | |||
@@ -0,0 +1,4 @@ | |||
1 | python () { | ||
2 | if d.getVar("BB_CURRENT_MC") == "mc2": | ||
3 | bb.fatal("Multiconfig is mc2") | ||
4 | } | ||