NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

support/testing: allow to indent ccache defconfig fragment

Browse Source 
Move the strip out of leading spaces in defconfig fragments from the
BRTest class to the Builder class. It actually postpones the strip out,
consequentially allowing test cases to post-process the defconfig in
their own __init__ before calling the __init__ method from BRTest.

Moving this code to the Builder class also allows any new test class
that inherits from BRTest to reuse the same code even if the new class
overrides the setUp method.

At same time, prepend a newline to the jlevel handling otherwise it
would stop working for defconfig fragments that don't end in a newline.

Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
Cc: Yann E. MORIN <yann.morin.1998@free.fr>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
This commit is contained in:
Ricardo Martincoski 2017-10-05 18:42:07 -03:00 committed by Arnout Vandecappelle (Essensium/Mind)
parent ec5ceae930
commit 4a1d220d9e
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
support/testing/infra/basetest.py
View File

@ -42,9 +42,7 @@ class BRTest(unittest.TestCase):
self.testname = self.__class__.__name__ self.testname = self.__class__.__name__
self.builddir = self.outputdir and os.path.join(self.outputdir, self.testname) self.builddir = self.outputdir and os.path.join(self.outputdir, self.testname)
self.emulator = None self.emulator = None
self.config = '\n'.join([line.lstrip() for line in self.config += "\nBR2_JLEVEL={}\n".format(self.jlevel)
self.config.splitlines()]) + '\n'
self.config += "BR2_JLEVEL={}\n".format(self.jlevel)
def show_msg(self, msg): def show_msg(self, msg):
print "{} {:40s} {}".format(datetime.datetime.now().strftime("%H:%M:%S"), print "{} {:40s} {}".format(datetime.datetime.now().strftime("%H:%M:%S"),

3
support/testing/infra/builder.py
View File

@ -6,7 +6,8 @@ import infra
class Builder(object): class Builder(object):
def __init__(self, config, builddir, logtofile): def __init__(self, config, builddir, logtofile):
self.config = config self.config = '\n'.join([line.lstrip() for line in
config.splitlines()]) + '\n'
self.builddir = builddir self.builddir = builddir
self.logfile = infra.open_log_file(builddir, "build", logtofile) self.logfile = infra.open_log_file(builddir, "build", logtofile)