sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

selftest: Added MACHINE = "qemux86" to tests that use runqemu 

It makes sense for tests that use runqemu to have MACHINE set as qemu.
This also avoid issues when running oe-selftest with --arch random/all
option.

(From OE-Core rev: 169e1eaa4fc5ed03e2307b68686a7f5b1db37a36)

Signed-off-by: Daniel Istrate <daniel.alexandrux.istrate@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Daniel Istrate 2015-12-18 17:12:16 +02:00 committed by Richard Purdie
parent b09080dc8a
commit ab79287688
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
meta/lib/oeqa/selftest/devtool.py
View File

@ -929,10 +929,11 @@ 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)

9
meta/lib/oeqa/selftest/imagefeatures.py
View File

@ -22,7 +22,8 @@ class ImageFeatures(oeSelfTest):
AutomatedBy: Daniel Istrate <daniel.alexandrux.istrate@intel.com>
"""
features = 'EXTRA_IMAGE_FEATURES = "ssh-server-openssh empty-root-password allow-empty-password"\n'
features = 'MACHINE = "qemux86"\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)
@ -48,7 +49,8 @@ class ImageFeatures(oeSelfTest):
AutomatedBy: Daniel Istrate <daniel.alexandrux.istrate@intel.com>
"""
features = 'EXTRA_IMAGE_FEATURES = "ssh-server-openssh allow-empty-password"\n'
features = 'MACHINE = "qemux86"\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)
@ -77,7 +79,8 @@ class ImageFeatures(oeSelfTest):
AutomatedBy: Daniel Istrate <daniel.alexandrux.istrate@intel.com>
"""
features = 'PREFERRED_VERSION_rpm = "4.%"\n'
features = 'MACHINE = "qemux86"\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'