diff options
-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 7d148d7262..20dbe8ddd7 100644 --- a/meta/classes/testimage.bbclass +++ b/meta/classes/testimage.bbclass | |||
@@ -26,6 +26,7 @@ inherit metadata_scm | |||
26 | # 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. | 26 | # 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. |
27 | # Booting is handled by this class, and it's not a test in itself. | 27 | # Booting is handled by this class, and it's not a test in itself. |
28 | # TEST_QEMUBOOT_TIMEOUT can be used to set the maximum time in seconds the launch code will wait for the login prompt. | 28 | # TEST_QEMUBOOT_TIMEOUT can be used to set the maximum time in seconds the launch code will wait for the login prompt. |
29 | # TEST_QEMUPARAMS can be used to pass extra parameters to qemu, e.g. "-m 1024" for setting the amount of ram to 1 GB. | ||
29 | 30 | ||
30 | TEST_LOG_DIR ?= "${WORKDIR}/testimage" | 31 | TEST_LOG_DIR ?= "${WORKDIR}/testimage" |
31 | 32 | ||
@@ -58,6 +59,7 @@ TEST_SUITES ?= "${DEFAULT_TEST_SUITES}" | |||
58 | 59 | ||
59 | TEST_QEMUBOOT_TIMEOUT ?= "1000" | 60 | TEST_QEMUBOOT_TIMEOUT ?= "1000" |
60 | TEST_TARGET ?= "qemu" | 61 | TEST_TARGET ?= "qemu" |
62 | TEST_QEMUPARAMS ?= "" | ||
61 | 63 | ||
62 | TESTIMAGEDEPENDS = "" | 64 | TESTIMAGEDEPENDS = "" |
63 | TESTIMAGEDEPENDS_qemuall = "qemu-native:do_populate_sysroot qemu-helper-native:do_populate_sysroot qemu-helper-native:do_addto_recipe_sysroot" | 65 | TESTIMAGEDEPENDS_qemuall = "qemu-native:do_populate_sysroot qemu-helper-native:do_populate_sysroot qemu-helper-native:do_addto_recipe_sysroot" |
@@ -292,7 +294,8 @@ def testimage_main(d): | |||
292 | try: | 294 | try: |
293 | # We need to check if runqemu ends unexpectedly | 295 | # We need to check if runqemu ends unexpectedly |
294 | # or if the worker send us a SIGTERM | 296 | # or if the worker send us a SIGTERM |
295 | tc.target.start(extra_bootparams=bootparams) | 297 | tc.target.start(params=d.getVar("TEST_QEMUPARAMS"), |
298 | extra_bootparams=bootparams) | ||
296 | results = tc.runTests() | 299 | results = tc.runTests() |
297 | except (RuntimeError, BlockingIOError) as err: | 300 | except (RuntimeError, BlockingIOError) as err: |
298 | if isinstance(err, RuntimeError): | 301 | if isinstance(err, RuntimeError): |