diff options
author | Erik Botö <erik.boto@gmail.com> | 2018-12-14 19:53:42 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-02-06 16:38:30 +0000 |
commit | b8ab2f0c1799fbe761d9aea03b3e5a9dd654e542 (patch) | |
tree | c016ead79e309aab64b1d61c2c8cdeafe909e3b9 /meta | |
parent | c4d64997238d89b395fcaa0abb412e0673ab8873 (diff) | |
download | poky-b8ab2f0c1799fbe761d9aea03b3e5a9dd654e542.tar.gz |
testimage: Add possibility to pass parmeters to qemu
Add a variable called TEST_QEMUPARAMS in testimage.bbclass to make it
possible to pass parameters to qemu. This can be useful for e.g.
increasing the amount of RAM available during testimage runs.
(From OE-Core rev: 1a9163f5779d233c884c8fd50e0812eabab4fdf3)
(From OE-Core rev: 0469c757e4a48d8ca2e2b7b128a285cf6d50513e)
Signed-off-by: Erik Botö <erik.boto@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/classes/testimage.bbclass | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/meta/classes/testimage.bbclass b/meta/classes/testimage.bbclass index 67d8b9ca8d..ed82a56ae3 100644 --- a/meta/classes/testimage.bbclass +++ b/meta/classes/testimage.bbclass | |||
@@ -31,6 +31,7 @@ TESTIMAGE_AUTO ??= "0" | |||
31 | # TEST_LOG_DIR contains a command ssh log and may contain infromation about what command is running, output and return codes and for qemu a boot log till login. | 31 | # TEST_LOG_DIR contains a command ssh log and may contain infromation about what command is running, output and return codes and for qemu a boot log till login. |
32 | # Booting is handled by this class, and it's not a test in itself. | 32 | # Booting is handled by this class, and it's not a test in itself. |
33 | # TEST_QEMUBOOT_TIMEOUT can be used to set the maximum time in seconds the launch code will wait for the login prompt. | 33 | # TEST_QEMUBOOT_TIMEOUT can be used to set the maximum time in seconds the launch code will wait for the login prompt. |
34 | # TEST_QEMUPARAMS can be used to pass extra parameters to qemu, e.g. "-m 1024" for setting the amount of ram to 1 GB. | ||
34 | 35 | ||
35 | TEST_LOG_DIR ?= "${WORKDIR}/testimage" | 36 | TEST_LOG_DIR ?= "${WORKDIR}/testimage" |
36 | 37 | ||
@@ -63,6 +64,7 @@ TEST_SUITES ?= "${DEFAULT_TEST_SUITES}" | |||
63 | 64 | ||
64 | TEST_QEMUBOOT_TIMEOUT ?= "1000" | 65 | TEST_QEMUBOOT_TIMEOUT ?= "1000" |
65 | TEST_TARGET ?= "qemu" | 66 | TEST_TARGET ?= "qemu" |
67 | TEST_QEMUPARAMS ?= "" | ||
66 | 68 | ||
67 | TESTIMAGEDEPENDS = "" | 69 | TESTIMAGEDEPENDS = "" |
68 | TESTIMAGEDEPENDS_append_qemuall = " qemu-native:do_populate_sysroot qemu-helper-native:do_populate_sysroot qemu-helper-native:do_addto_recipe_sysroot" | 70 | TESTIMAGEDEPENDS_append_qemuall = " qemu-native:do_populate_sysroot qemu-helper-native:do_populate_sysroot qemu-helper-native:do_addto_recipe_sysroot" |
@@ -295,7 +297,8 @@ def testimage_main(d): | |||
295 | try: | 297 | try: |
296 | # We need to check if runqemu ends unexpectedly | 298 | # We need to check if runqemu ends unexpectedly |
297 | # or if the worker send us a SIGTERM | 299 | # or if the worker send us a SIGTERM |
298 | tc.target.start(extra_bootparams=bootparams) | 300 | tc.target.start(params=d.getVar("TEST_QEMUPARAMS"), |
301 | extra_bootparams=bootparams) | ||
299 | results = tc.runTests() | 302 | results = tc.runTests() |
300 | except (RuntimeError, BlockingIOError) as err: | 303 | except (RuntimeError, BlockingIOError) as err: |
301 | if isinstance(err, RuntimeError): | 304 | if isinstance(err, RuntimeError): |