Message ID | 20230912113242.3994352-1-richard.purdie@linuxfoundation.org |
---|---|
State | Accepted, archived |
Commit | e1a12c1212013823b44aff88317e5b30df03a35c |
Headers | show |
Series | oeqa/selftest/runtime_test: No need to use append with TEST_RUNQEMUPARAMS | expand |
Hi, On Tue, Sep 12, 2023 at 12:32:42PM +0100, Richard Purdie wrote: > A simple += operation is fine for working with TEST_RUNQEMUPARAMS so remove > the heavier append override usage. Ok, but I was being consistent with the other variables in the tests. Cheers, -Mikko > Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> > --- > meta/lib/oeqa/selftest/cases/runtime_test.py | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/meta/lib/oeqa/selftest/cases/runtime_test.py b/meta/lib/oeqa/selftest/cases/runtime_test.py > index 57d3852d579..12000aac16e 100644 > --- a/meta/lib/oeqa/selftest/cases/runtime_test.py > +++ b/meta/lib/oeqa/selftest/cases/runtime_test.py > @@ -138,7 +138,7 @@ class TestImage(OESelftestTestCase): > IMAGE_CLASSES:append = " testimage" > IMAGE_FEATURES:append = " ssh-server-dropbear" > IMAGE_ROOTFS_EXTRA_SPACE:append = "${@bb.utils.contains("IMAGE_CLASSES", "testimage", " + 5120", "", d)}" > -TEST_RUNQEMUPARAMS:append = " slirp" > +TEST_RUNQEMUPARAMS += " slirp" > ''' > self.write_config(features) > > @@ -252,11 +252,11 @@ TEST_RUNQEMUPARAMS:append = " slirp" > features += 'TEST_SUITES = "ping ssh virgl"\n' > features += 'IMAGE_FEATURES:append = " ssh-server-dropbear"\n' > features += 'IMAGE_INSTALL:append = " kmscube"\n' > - features_gtk = features + 'TEST_RUNQEMUPARAMS:append = " gtk gl"\n' > + features_gtk = features + 'TEST_RUNQEMUPARAMS += " gtk gl"\n' > self.write_config(features_gtk) > bitbake('core-image-minimal') > bitbake('-c testimage core-image-minimal') > - features_sdl = features + 'TEST_RUNQEMUPARAMS:append = " sdl gl"\n' > + features_sdl = features + 'TEST_RUNQEMUPARAMS += " sdl gl"\n' > self.write_config(features_sdl) > bitbake('core-image-minimal') > bitbake('-c testimage core-image-minimal') > @@ -284,7 +284,7 @@ TEST_RUNQEMUPARAMS:append = " slirp" > features += 'TEST_SUITES = "ping ssh virgl"\n' > features += 'IMAGE_FEATURES:append = " ssh-server-dropbear"\n' > features += 'IMAGE_INSTALL:append = " kmscube"\n' > - features += 'TEST_RUNQEMUPARAMS:append = " egl-headless"\n' > + features += 'TEST_RUNQEMUPARAMS += " egl-headless"\n' > self.write_config(features) > bitbake('core-image-minimal') > bitbake('-c testimage core-image-minimal') > -- > 2.39.2 > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#187507): https://lists.openembedded.org/g/openembedded-core/message/187507 > Mute This Topic: https://lists.openembedded.org/mt/101312801/7159507 > Group Owner: openembedded-core+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [mikko.rapeli@linaro.org] > -=-=-=-=-=-=-=-=-=-=-=- >
On Tue, 2023-09-12 at 14:46 +0300, Mikko Rapeli wrote: > Hi, > > On Tue, Sep 12, 2023 at 12:32:42PM +0100, Richard Purdie wrote: > > A simple += operation is fine for working with TEST_RUNQEMUPARAMS so remove > > the heavier append override usage. > > Ok, but I was being consistent with the other variables in the tests. Fair enough, I did kind of guess that. In general we want to try and reduce the amount of :append use over time though so where we have a choice, we should just use +=. Cheers, Richard
Hi, On Tue, Sep 12, 2023 at 12:50:26PM +0100, Richard Purdie wrote: > On Tue, 2023-09-12 at 14:46 +0300, Mikko Rapeli wrote: > > Hi, > > > > On Tue, Sep 12, 2023 at 12:32:42PM +0100, Richard Purdie wrote: > > > A simple += operation is fine for working with TEST_RUNQEMUPARAMS so remove > > > the heavier append override usage. > > > > Ok, but I was being consistent with the other variables in the tests. > > Fair enough, I did kind of guess that. In general we want to try and > reduce the amount of :append use over time though so where we have a > choice, we should just use +=. I fully agree to this but I wasn't sure what kind of local.conf is used together with the test so an :append made sure that the needed content was added, always. Cheers, -Mikko
diff --git a/meta/lib/oeqa/selftest/cases/runtime_test.py b/meta/lib/oeqa/selftest/cases/runtime_test.py index 57d3852d579..12000aac16e 100644 --- a/meta/lib/oeqa/selftest/cases/runtime_test.py +++ b/meta/lib/oeqa/selftest/cases/runtime_test.py @@ -138,7 +138,7 @@ class TestImage(OESelftestTestCase): IMAGE_CLASSES:append = " testimage" IMAGE_FEATURES:append = " ssh-server-dropbear" IMAGE_ROOTFS_EXTRA_SPACE:append = "${@bb.utils.contains("IMAGE_CLASSES", "testimage", " + 5120", "", d)}" -TEST_RUNQEMUPARAMS:append = " slirp" +TEST_RUNQEMUPARAMS += " slirp" ''' self.write_config(features) @@ -252,11 +252,11 @@ TEST_RUNQEMUPARAMS:append = " slirp" features += 'TEST_SUITES = "ping ssh virgl"\n' features += 'IMAGE_FEATURES:append = " ssh-server-dropbear"\n' features += 'IMAGE_INSTALL:append = " kmscube"\n' - features_gtk = features + 'TEST_RUNQEMUPARAMS:append = " gtk gl"\n' + features_gtk = features + 'TEST_RUNQEMUPARAMS += " gtk gl"\n' self.write_config(features_gtk) bitbake('core-image-minimal') bitbake('-c testimage core-image-minimal') - features_sdl = features + 'TEST_RUNQEMUPARAMS:append = " sdl gl"\n' + features_sdl = features + 'TEST_RUNQEMUPARAMS += " sdl gl"\n' self.write_config(features_sdl) bitbake('core-image-minimal') bitbake('-c testimage core-image-minimal') @@ -284,7 +284,7 @@ TEST_RUNQEMUPARAMS:append = " slirp" features += 'TEST_SUITES = "ping ssh virgl"\n' features += 'IMAGE_FEATURES:append = " ssh-server-dropbear"\n' features += 'IMAGE_INSTALL:append = " kmscube"\n' - features += 'TEST_RUNQEMUPARAMS:append = " egl-headless"\n' + features += 'TEST_RUNQEMUPARAMS += " egl-headless"\n' self.write_config(features) bitbake('core-image-minimal') bitbake('-c testimage core-image-minimal')
A simple += operation is fine for working with TEST_RUNQEMUPARAMS so remove the heavier append override usage. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> --- meta/lib/oeqa/selftest/cases/runtime_test.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)