[Buildroot] [PATCH 2/5] support/testing: indent ccache defconfig fragment
Yann E. MORIN
yann.morin.1998 at free.fr
Mon Oct 2 05:49:06 UTC 2017
Ricardo, All,
On 2017-10-01 22:03 -0300, Ricardo Martincoski spake thusly:
> On Fri, Sep 29, 2017 at 05:17 AM, Yann E. MORIN wrote:
> > On 2017-09-28 23:27 -0300, Ricardo Martincoski spake thusly:
> >> Postpone the strip out of leading spaces in defconfig fragments from the
> >> __init__ to the setUp method. It allows test cases to post-process the
> >> defconfig in their own __init__ before calling the __init__ method from
> >> the base class.
> >
> > Ideally, this should have been the very first patch in the series.
>
> Good idea. I will do, but...
>
> >
> >> Indent the only fragment in the tree that currently need this (in the
> >> ccache test case), taking advantage of
> >> "cf3cd4388a support/tests: allow properly indented config fragment".
> >
> > And then that wcould have gone in the other patch without any issue.
>
> It should. But the reordering shows the jlevel handling is fragile.
>
> Both the rootfs overlay and yaffs2 tests currently have defconfig fragments that
> don't end in a newline, so the new patch 1 ends up silently disabling jlevel:
> ...s/core/rootfs-overlay2"BR2_JLEVEL=1
> BR2_TARGET_ROOTFS_YAFFS2=yBR2_JLEVEL=1
Weird, because on line 46, we explicitly add a trainling '\n' :
https://git.buildroot.org/buildroot/tree/support/testing/infra/basetest.py#n45
45: self.config = '\n'.join([line.lstrip() for line in
self.config.splitlines()]) + '\n'
46: self.config += "BR2_JLEVEL={}\n".format(self.jlevel)
> So I plan to add another patch before the series, to make jlevel handling more
> robust (to other changes in the infra) and at same time use the same style.
> self.config += \
> """
> BR2_JLEVEL={}
> """.format(self.jlevel)
Well, I doubt this is useful. Just prepend a \n, if it really is useful :
self.config += "\nBR2_JLEVEL={}\n".format(self.jlevel)
> It also made me realize that this patch implies that I need to resend another
> one (tests for the git downloader) since there I override the setUp method.
> http://patchwork.ozlabs.org/patch/806161/
> I would need to duplicate there the logic to remove the indentation of defconfig
> fragments.
>
> Perhaps instead of moving the logic to the setUp of BRTest I could move it to
> the builder init. This way any new test class that reimplements setUp and uses
> builder will "inherit" it. Those that reimplement setUp but don't use builder
> don't need that code.
> class Builder(object):
> def __init__(self, config, builddir, logtofile):
> self.config = '\n'.join([line.lstrip() for line in
> config.splitlines()]) + '\n'
> What do you think?
Yes, that would probably be better.
Regards,
Yann E. MORIN.
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
More information about the buildroot
mailing list