]> code.ossystems Code Review - openembedded-core.git/commit
scripts/runqemu: Fix logic error causing failures with MACHINE from the environment
authorRichard Purdie <richard.purdie@linuxfoundation.org>
Wed, 28 Nov 2018 16:09:56 +0000 (16:09 +0000)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Tue, 8 Jan 2019 20:12:07 +0000 (20:12 +0000)
commitbf2ae1ca01edf02a930d70e50b8e1e71f7ec2237
tree984f17192c6c1e58a43f936b674579e5435299e6
parent1d753f62d3e09cac92aadffc45992a04b95f0396
scripts/runqemu: Fix logic error causing failures with MACHINE from the environment

MACHINE=qemux86-64 oe-selftest -r runqemu.RunqemuTests.test_boot_machine_slirp_qcow2

fails yet

oe-selftest -r runqemu.RunqemuTests.test_boot_machine_slirp_qcow2

with MACHINE in local.conf would work.

It turns out that:

runqemu slirp wic.qcow2 qemux86-64

works but:

MACHINE=qemux86-64 runqemu slirp wic.qcow2 qemux86-64

does not.

The reason are the misplaced return statements in runqemu, its skipping a block
of logic when MACHINE is set in the environment when it shouldn't. Fix this.

(From OE-Core rev: 98d113ae52cbbc88773a81a17b0933412a8e463b)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
scripts/runqemu