documentation.conf: remove unused IMAGETEST variable
PATCH 1/3 documentation.conf: remove unused IMAGETEST variable
--- meta/conf/documentation.conf | 1 - 1 file changed, 1 deletion(-)
meta/conf/documentation.conf +0 -1
@@ -118,7 +118,6 @@ IMAGE_LINGUAS[doc] = "Specifies the list of locales to install into the image du IMAGE_OVERHEAD_FACTOR[doc] = "Defines a multiplier that the build system applies to the initial image size for cases when the multiplier times the returned disk usage value for the image is greater than the sum of IMAGE_ROOTFS_SIZE and IMAGE_ROOTFS_EXTRA_SPACE." IMAGE_ROOTFS_EXTRA_SPACE[doc] = "Defines additional free disk space created in the image in Kbytes. By default, this variable is set to '0'." IMAGE_ROOTFS_SIZE[doc] = "Defines the size in Kbytes for the generated image." -IMAGETEST[doc] = "Enable test booting of virtual machine images under the qemu emulator after any root filesystems are created and run tests against those images." INC_PR[doc] = "Helps define the recipe revision for recipes that share a common include file." INHIBIT_PACKAGE_STRIP[doc] = "If set to "1", causes the build to not strip binaries in resulting packages." INHERIT[doc] = "Causes the named class to be inherited at this point during parsing. The variable is only valid in configuration files."
Signature · 1 line
1.7.10.4
PATCH 2/3 lib/oeqa/runtime: print connman status if connman failed to start
If connman isn't running and we're running under systemd, use systemctl to get the state according to systemd and the end of the connman log.
--- meta/lib/oeqa/runtime/connman.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
meta/lib/oeqa/runtime/connman.py +10 -1
@@ -9,6 +9,13 @@ def setUpModule(): class ConnmanTest(oeRuntimeTest): + def service_status(self, service): + if oeRuntimeTest.hasFeature("systemd"): + (status, output) = self.target.run('systemctl status -l %s' % service) + return output + else: + return "Unable to get status or logs for %s" % service + @skipUnlessPassed('test_ssh') def test_connmand_help(self): (status, output) = self.target.run('/usr/sbin/connmand --help')
@@ -18,4 +25,6 @@ class ConnmanTest(oeRuntimeTest): @skipUnlessPassed('test_connmand_help') def test_connmand_running(self): (status, output) = self.target.run(oeRuntimeTest.pscmd + ' | grep [c]onnmand') - self.assertEqual(status, 0, msg="no connmand process, ps output: %s" % self.target.run(oeRuntimeTest.pscmd)[1]) + if status != 0: + print self.service_status("connman") + self.fail("No connmand process running")
Signature · 1 line
1.7.10.4
PATCH 3/3 lib/oeqa/runtime: output more logging from systemd when services have failed
In reply to Ross BurtonIf some services have failed to start, get the status of them and some of their log to help debug the problem.
--- meta/lib/oeqa/runtime/systemd.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
meta/lib/oeqa/runtime/systemd.py +3 -1
@@ -21,7 +21,9 @@ class SystemdTests(oeRuntimeTest): @skipUnlessPassed('test_systemd_version') def test_systemd_failed(self): (status, output) = self.target.run('systemctl --failed | grep "0 loaded units listed"') - self.assertEqual(status, 0, msg="Failed systemd services: %s" % self.target.run('systemctl --failed')[1]) + if status != 0: + print self.target.run('systemctl status --failed -l')[1] + self.fail("Some systemd units failed.") @skipUnlessPassed('test_systemd_version') def test_systemd_service(self):
Signature · 1 line
1.7.10.4
Quoted 10 lines · Ross Burton
Signed-off-by Ross Burton <[email protected]>--- meta/conf/documentation.conf | 1 - 1 file changed, 1 deletion(-)meta/conf/documentation.conf +0
-0
meta/conf/documentation.conf IMAGE_LINGUAS[doc] = "Specifies the list of locales to install into the image du · line 123
Quoted 7 lines
meta/conf/documentation.conf +0
-1@@ -118,7 +118,6 @@ IMAGE_LINGUAS[doc] = "Specifies the list of locales to install into the image du IMAGE_OVERHEAD_FACTOR[doc] = "Defines a multiplier that the build system applies to the initial image size for cases when the multiplier times the returned disk usage value for the image is greater than the sum of IMAGE_ROOTFS_SIZE and IMAGE_ROOTFS_EXTRA_SPACE." IMAGE_ROOTFS_EXTRA_SPACE[doc] = "Defines additional free disk space created in the image in Kbytes. By default, this variable is set to '0'." IMAGE_ROOTFS_SIZE[doc] = "Defines the size in Kbytes for the generated image." -IMAGETEST[doc] = "Enable test booting of virtual machine images under the qemu emulator after any root filesystems are created and run tests against those images." INC_PR[doc] = "Helps define the recipe revision for recipes that share a common include file." INHIBIT_PACKAGE_STRIP[doc] = "If set to "1", causes the build to not strip binaries in resulting packages." INHERIT[doc] = "Causes the named class to be inherited at this point during parsing. The variable is only valid in configuration files."
Isn't it actually IMAGE_TEST ?
Cheers,
Richard
Quoted 23 lines · On Thursday 05 December 2013 13:32:54 Richard Purdie wrote:
Quoted 22 lines · Ross Burton
Signed-off-by Ross Burton <[email protected]>---
meta/conf/documentation.conf | 1 - 1 file changed, 1 deletion(-)meta/conf/documentation.conf +0
-0@@ -118,7 +118,6 @@ IMAGE_LINGUAS[doc] = "Specifies the list of locales toinstall into the image du>
IMAGE_OVERHEAD_FACTOR[doc] = "Defines a multiplier that the build system applies to the initial image size for cases when the multiplier times the returned disk usage value for the image is greater than the sum ofIMAGE_ROOTFS_SIZEandIMAGE_ROOTFS_EXTRA_SPACE." IMAGE_ROOTFS_EXTRA_SPACE[doc] = "Defines additional free disk space created in the image in Kbytes. By default, this variable is set to '0'." IMAGE_ROOTFS_SIZE[doc] = "Defines the size in Kbytes for the generated image.">
-IMAGETEST[doc] = "Enable test booting of virtual machine images under the qemu emulator after any root filesystems are created and run tests
Quoted 8 lines
Quoted 6 lines
against those images.">
INC_PR[doc] = "Helps define the recipe revision for recipes that share a common include file." INHIBIT_PACKAGE_STRIP[doc] = "If set to "1", causes the build to not strip binaries in resulting packages." INHERIT[doc] = "Causes the named class to be inherited at this point during parsing. The variable is only valid in configuration files."Isn't it actually
IMAGE_TEST?
If you mean what it is now, it's TEST_IMAGE.
If we're removing the old IMAGETEST variable (and we should) we should also remove TEST_SCEN at the same time.
Cheers,
Paul
Signature · 2 lines
Paul Eggleton Intel Open Source Technology Centre
Quoted 40 lines · On Thursday 05 December 2013 13:42:17 Paul Eggleton wrote:
Quoted 30 lines · On Thursday 05 December 2013 13:32:54 Richard Purdie wrote:
Quoted 29 lines · Ross Burton
Signed-off-by Ross Burton <[email protected]>---
meta/conf/documentation.conf | 1 - 1 file changed, 1 deletion(-)meta/conf/documentation.conf +0
-0@@ -118,7 +118,6 @@ IMAGE_LINGUAS[doc] = "Specifies the list of localesto
install into the image du>IMAGE_OVERHEAD_FACTOR[doc] = "Defines a multiplier that the build system
applies to the initial image size for cases when the multiplier times the returned disk usage value for the image is greater than the sum ofIMAGE_ROOTFS_SIZEandIMAGE_ROOTFS_EXTRA_SPACE." IMAGE_ROOTFS_EXTRA_SPACE[doc] = "Defines additional free disk space created in the image in Kbytes. By default, this variable is set to '0'." IMAGE_ROOTFS_SIZE[doc] = "Defines the size in Kbytes for the generated image.">-IMAGETEST[doc] = "Enable test booting of virtual machine images under the
qemu emulator after any root filesystems are created and run tests against those images.">Quoted 8 lines
Quoted 6 lines
INC_PR[doc] = "Helps define the recipe revision for recipes that share a
common include file." INHIBIT_PACKAGE_STRIP[doc] = "If set to "1", causes the build to not strip binaries in resulting packages." INHERIT[doc] = "Causes the named class to be inherited at this point during parsing. The variable is only valid in configuration files."Isn't it actually
IMAGE_TEST?
Quoted 4 lines
If you mean what it is now, it's
TEST_IMAGE.If we're removing the old IMAGETEST variable (and we should) we should also remove
TEST_SCENat the same time.
... and also TEST_SERIALIZE.
Cheers,
Paul
Signature · 2 lines
Paul Eggleton Intel Open Source Technology Centre