From 169e1eaa4fc5ed03e2307b68686a7f5b1db37a36 Mon Sep 17 00:00:00 2001 From: Daniel Istrate Date: Fri, 18 Dec 2015 17:12:16 +0200 Subject: 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. Signed-off-by: Daniel Istrate Signed-off-by: Ross Burton --- meta/lib/oeqa/selftest/devtool.py | 7 ++++--- meta/lib/oeqa/selftest/imagefeatures.py | 9 ++++++--- 2 files changed, 10 insertions(+), 6 deletions(-) (limited to 'meta/lib/oeqa') diff --git a/meta/lib/oeqa/selftest/devtool.py b/meta/lib/oeqa/selftest/devtool.py index 955379bad5..6f76ce7b84 100644 --- a/meta/lib/oeqa/selftest/devtool.py +++ b/meta/lib/oeqa/selftest/devtool.py @@ -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) diff --git a/meta/lib/oeqa/selftest/imagefeatures.py b/meta/lib/oeqa/selftest/imagefeatures.py index 4efb0d92a3..62ddc52bcc 100644 --- a/meta/lib/oeqa/selftest/imagefeatures.py +++ b/meta/lib/oeqa/selftest/imagefeatures.py @@ -22,7 +22,8 @@ class ImageFeatures(oeSelfTest): AutomatedBy: Daniel Istrate """ - 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 """ - 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 """ - 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' -- cgit v1.2.3