path: root/support
diff options
authorGravatar Ricardo Martincoski <ricardo.martincoski@gmail.com>2017-10-05 18:42:07 -0300
committerGravatar Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>2017-10-06 18:53:13 +0200
commit4a1d220d9eeebd8394a190c4d82a00139c4baa51 (patch)
treecfebd87a8a654635d390bed4b18f7fa47339f4c5 /support
parentec5ceae930d729e79c90022a7b63301ad7a300d7 (diff)
support/testing: allow to indent ccache defconfig fragment
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>
Diffstat (limited to 'support')
2 files changed, 3 insertions, 4 deletions
diff --git a/support/testing/infra/basetest.py b/support/testing/infra/basetest.py
index 493dea5125..d6fcc619b1 100644
--- a/support/testing/infra/basetest.py
+++ b/support/testing/infra/basetest.py
@@ -42,9 +42,7 @@ class BRTest(unittest.TestCase):
self.testname = self.__class__.__name__
self.builddir = self.outputdir and os.path.join(self.outputdir, self.testname)
self.emulator = None
- self.config = '\n'.join([line.lstrip() for line in
- self.config.splitlines()]) + '\n'
- self.config += "BR2_JLEVEL={}\n".format(self.jlevel)
+ self.config += "\nBR2_JLEVEL={}\n".format(self.jlevel)
def show_msg(self, msg):
print "{} {:40s} {}".format(datetime.datetime.now().strftime("%H:%M:%S"),
diff --git a/support/testing/infra/builder.py b/support/testing/infra/builder.py
index 905b127c91..ef66b86113 100644
--- a/support/testing/infra/builder.py
+++ b/support/testing/infra/builder.py
@@ -6,7 +6,8 @@ import infra
class Builder(object):
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.logfile = infra.open_log_file(builddir, "build", logtofile)