Fix for QEMU-using oe-selftest tests
cover Fix for QEMU-using oe-selftest tests
The following changes since commit 300f858ba07c938427ccd05a3d7220027a03d461:
local.conf.sample: Disable prelink by default (2016-03-13 22:08:55 +0000)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib paule/oe-selftest-qemu
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=paule/oe-selftest-qemu
Paul Eggleton (1):
Revert "selftest: Added MACHINE = "qemux86" to tests that use runqemu"
meta/lib/oeqa/selftest/devtool.py | 7 +++---- meta/lib/oeqa/selftest/imagefeatures.py | 9 +++------ 2 files changed, 6 insertions(+), 10 deletions(-)
Signature · 1 line
2.5.0
PATCH 1/1 Revert "selftest: Added MACHINE = "qemux86" to tests that use runqemu"
This is not the correct way to handle this - it significantly increases the time taken to run oe-selftest anywhere MACHINE is set to some other value (for example "qemux86-64"), because all of the artifacts for qemux86 need to then be built as well when running the test. If we need to skip these tests on non-QEMU machines, the devtool test already demonstrates how to do that.
This reverts commit 169e1eaa4fc5ed03e2307b68686a7f5b1db37a36.
--- meta/lib/oeqa/selftest/devtool.py | 7 +++---- meta/lib/oeqa/selftest/imagefeatures.py | 9 +++------ 2 files changed, 6 insertions(+), 10 deletions(-)
meta/lib/oeqa/selftest/devtool.py +3 -4
@@ -979,11 +979,10 @@ class DevtoolTests(DevtoolBase): # Additionally we are testing build-time functionality as well, so # really this has to be done as an oe-selftest test. # - - features = 'MACHINE = "qemux86"\n' - self.write_config(features) - # Check preconditions + machine = get_bb_var('MACHINE') + if not machine.startswith('qemu'): + self.skipTest('This test only works with qemu machines') if not os.path.exists('/etc/runqemu-nosudo'): self.skipTest('You must set up tap devices with scripts/runqemu-gen-tapdevs before running this test') result = runCmd('PATH="$PATH:/sbin:/usr/sbin" ip tuntap show', ignore_status=True)
meta/lib/oeqa/selftest/imagefeatures.py +3 -6
@@ -22,8 +22,7 @@ class ImageFeatures(oeSelfTest): AutomatedBy: Daniel Istrate <[email protected]> """ - features = 'MACHINE = "qemux86"\n' - features += 'EXTRA_IMAGE_FEATURES = "ssh-server-openssh empty-root-password allow-empty-password"\n' + features = 'EXTRA_IMAGE_FEATURES = "ssh-server-openssh empty-root-password allow-empty-password"\n' features += 'INHERIT += "extrausers"\n' features += 'EXTRA_USERS_PARAMS = "useradd -p \'\' {}; usermod -s /bin/sh {};"'.format(self.test_user, self.test_user) self.write_config(features)
@@ -49,8 +48,7 @@ class ImageFeatures(oeSelfTest): AutomatedBy: Daniel Istrate <[email protected]> """ - features = 'MACHINE = "qemux86"\n' - features += 'EXTRA_IMAGE_FEATURES = "ssh-server-openssh allow-empty-password"\n' + features = 'EXTRA_IMAGE_FEATURES = "ssh-server-openssh allow-empty-password"\n' features += 'INHERIT += "extrausers"\n' features += 'EXTRA_USERS_PARAMS = "useradd -p \'\' {}; usermod -s /bin/sh {};"'.format(self.test_user, self.test_user) self.write_config(features)
@@ -79,8 +77,7 @@ class ImageFeatures(oeSelfTest): AutomatedBy: Daniel Istrate <[email protected]> """ - features = 'MACHINE = "qemux86"\n' - features += 'PREFERRED_VERSION_rpm = "4.%"\n' + features = 'PREFERRED_VERSION_rpm = "4.%"\n' features += 'PREFERRED_VERSION_rpm-native = "4.%"\n' # Use openssh in IMAGE_INSTALL instead of ssh-server-openssh in EXTRA_IMAGE_FEATURES as a workaround for bug 8047 features += 'IMAGE_INSTALL_append = " openssh"\n'
Signature · 1 line
2.5.0