[Buildroot] [PATCH 2/5] support/testing: indent ccache defconfig fragment
Ricardo Martincoski
ricardo.martincoski at gmail.com
Fri Sep 29 02:27:10 UTC 2017
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.
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".
Signed-off-by: Ricardo Martincoski <ricardo.martincoski at gmail.com>
---
Tested by hacking support/testing/infra/builder.py
@@ -30,2 +30,3 @@ class Builder(object):
raise SystemError("Cannot olddefconfig")
+ raise SystemError("Stop")
and diffing the resulting *-build.log files against old ones: few empty
lines are added/removed. Also tested diffing the resulting .config files
against old ones: they are the same.
Warnings from flake8 change from 100 to 99.
---
support/testing/infra/basetest.py | 4 ++--
support/testing/tests/toolchain/test_external.py | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/support/testing/infra/basetest.py b/support/testing/infra/basetest.py
index d205119b2c..c41852949a 100644
--- a/support/testing/infra/basetest.py
+++ b/support/testing/infra/basetest.py
@@ -42,8 +42,6 @@ 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)
def show_msg(self, msg):
@@ -51,6 +49,8 @@ class BRTest(unittest.TestCase):
self.testname, msg)
def setUp(self):
self.show_msg("Starting")
+ self.config = '\n'.join([line.lstrip() for line in
+ self.config.splitlines()]) + '\n'
self.b = Builder(self.config, self.builddir, self.logtofile)
if not self.keepbuilds:
diff --git a/support/testing/tests/toolchain/test_external.py b/support/testing/tests/toolchain/test_external.py
index 1bb5e9497b..ad2f56a20e 100644
--- a/support/testing/tests/toolchain/test_external.py
+++ b/support/testing/tests/toolchain/test_external.py
@@ -232,10 +232,10 @@ class TestExternalToolchainBuildrootuClibc(TestExternalToolchain):
class TestExternalToolchainCCache(TestExternalToolchainBuildrootuClibc):
extraconfig = \
-"""
-BR2_CCACHE=y
-BR2_CCACHE_DIR="{builddir}/ccache-dir"
-"""
+ """
+ BR2_CCACHE=y
+ BR2_CCACHE_DIR="{builddir}/ccache-dir"
+ """
def __init__(self, names):
super(TestExternalToolchainBuildrootuClibc, self).__init__(names)
--
2.13.0
More information about the buildroot
mailing list