diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2016-03-14 11:25:56 +1300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-03-20 23:12:26 +0000 |
commit | 9cc65ed0209b756262ae4c73a5d172db4fe01fd6 (patch) | |
tree | dcacbdda16e5b5010811414f58c3f947dff9ac90 /meta/lib/oeqa/selftest/imagefeatures.py | |
parent | 3c5ee61b6d065de195e8ca9126b75c0607b02050 (diff) | |
download | poky-9cc65ed0209b756262ae4c73a5d172db4fe01fd6.tar.gz |
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.
(From OE-Core rev: f60da6d5be5469ed5b834759c3822471f81fcdd2)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oeqa/selftest/imagefeatures.py')
-rw-r--r-- | meta/lib/oeqa/selftest/imagefeatures.py | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/meta/lib/oeqa/selftest/imagefeatures.py b/meta/lib/oeqa/selftest/imagefeatures.py index 1c08ce2814..ac8c5ae410 100644 --- a/meta/lib/oeqa/selftest/imagefeatures.py +++ b/meta/lib/oeqa/selftest/imagefeatures.py | |||
@@ -22,8 +22,7 @@ class ImageFeatures(oeSelfTest): | |||
22 | AutomatedBy: Daniel Istrate <daniel.alexandrux.istrate@intel.com> | 22 | AutomatedBy: Daniel Istrate <daniel.alexandrux.istrate@intel.com> |
23 | """ | 23 | """ |
24 | 24 | ||
25 | features = 'MACHINE = "qemux86"\n' | 25 | features = 'EXTRA_IMAGE_FEATURES = "ssh-server-openssh empty-root-password allow-empty-password"\n' |
26 | features += 'EXTRA_IMAGE_FEATURES = "ssh-server-openssh empty-root-password allow-empty-password"\n' | ||
27 | features += 'INHERIT += "extrausers"\n' | 26 | features += 'INHERIT += "extrausers"\n' |
28 | features += 'EXTRA_USERS_PARAMS = "useradd -p \'\' {}; usermod -s /bin/sh {};"'.format(self.test_user, self.test_user) | 27 | features += 'EXTRA_USERS_PARAMS = "useradd -p \'\' {}; usermod -s /bin/sh {};"'.format(self.test_user, self.test_user) |
29 | self.write_config(features) | 28 | self.write_config(features) |
@@ -49,8 +48,7 @@ class ImageFeatures(oeSelfTest): | |||
49 | AutomatedBy: Daniel Istrate <daniel.alexandrux.istrate@intel.com> | 48 | AutomatedBy: Daniel Istrate <daniel.alexandrux.istrate@intel.com> |
50 | """ | 49 | """ |
51 | 50 | ||
52 | features = 'MACHINE = "qemux86"\n' | 51 | features = 'EXTRA_IMAGE_FEATURES = "ssh-server-openssh allow-empty-password"\n' |
53 | features += 'EXTRA_IMAGE_FEATURES = "ssh-server-openssh allow-empty-password"\n' | ||
54 | features += 'INHERIT += "extrausers"\n' | 52 | features += 'INHERIT += "extrausers"\n' |
55 | features += 'EXTRA_USERS_PARAMS = "useradd -p \'\' {}; usermod -s /bin/sh {};"'.format(self.test_user, self.test_user) | 53 | features += 'EXTRA_USERS_PARAMS = "useradd -p \'\' {}; usermod -s /bin/sh {};"'.format(self.test_user, self.test_user) |
56 | self.write_config(features) | 54 | self.write_config(features) |
@@ -79,8 +77,7 @@ class ImageFeatures(oeSelfTest): | |||
79 | AutomatedBy: Daniel Istrate <daniel.alexandrux.istrate@intel.com> | 77 | AutomatedBy: Daniel Istrate <daniel.alexandrux.istrate@intel.com> |
80 | """ | 78 | """ |
81 | 79 | ||
82 | features = 'MACHINE = "qemux86"\n' | 80 | features = 'PREFERRED_VERSION_rpm = "4.%"\n' |
83 | features += 'PREFERRED_VERSION_rpm = "4.%"\n' | ||
84 | features += 'PREFERRED_VERSION_rpm-native = "4.%"\n' | 81 | features += 'PREFERRED_VERSION_rpm-native = "4.%"\n' |
85 | # Use openssh in IMAGE_INSTALL instead of ssh-server-openssh in EXTRA_IMAGE_FEATURES as a workaround for bug 8047 | 82 | # Use openssh in IMAGE_INSTALL instead of ssh-server-openssh in EXTRA_IMAGE_FEATURES as a workaround for bug 8047 |
86 | features += 'IMAGE_INSTALL_append = " openssh"\n' | 83 | features += 'IMAGE_INSTALL_append = " openssh"\n' |