| Message ID | 20200618123912.64762-1-vitor@massaru.org (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | [v2] kunit: fix KconfigParseError handling CC_VERSION_TEXT | expand |
On Thu, Jun 18, 2020 at 5:39 AM Vitor Massaru Iha <vitor@massaru.org> wrote: > > Commit 8b59cd81dc5 ("kbuild: ensure full rebuild when the compiler > is updated") added the environment variable CC_VERSION_TEXT, > parse_from_string() doesn't expect a string in value field and this > causes the failure below: > > [iha@bbking linux]$ tools/testing/kunit/kunit.py run --timeout=60 > [00:20:12] Configuring KUnit Kernel ... > Generating .config ... > Traceback (most recent call last): > File "tools/testing/kunit/kunit.py", line 347, in <module> > main(sys.argv[1:]) > File "tools/testing/kunit/kunit.py", line 257, in main > result = run_tests(linux, request) > File "tools/testing/kunit/kunit.py", line 134, in run_tests > config_result = config_tests(linux, config_request) > File "tools/testing/kunit/kunit.py", line 64, in config_tests > success = linux.build_reconfig(request.build_dir, request.make_options) > File "/home/iha/lkmp/linux/tools/testing/kunit/kunit_kernel.py", line 161, in build_reconfig > return self.build_config(build_dir, make_options) > File "/home/iha/lkmp/linux/tools/testing/kunit/kunit_kernel.py", line 145, in build_config > return self.validate_config(build_dir) > File "/home/iha/lkmp/linux/tools/testing/kunit/kunit_kernel.py", line 124, in validate_config > validated_kconfig.read_from_file(kconfig_path) > File "/home/iha/lkmp/linux/tools/testing/kunit/kunit_config.py", line 89, in read_from_file > self.parse_from_string(f.read()) > File "/home/iha/lkmp/linux/tools/testing/kunit/kunit_config.py", line 85, in parse_from_string > raise KconfigParseError('Failed to parse: ' + line) > kunit_config.KconfigParseError: Failed to parse: CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.1.1 20200507 (Red Hat 10.1.1-1)" I am pretty there is already a fix out for this issue: https://patchwork.kernel.org/patch/11592313/ Can you confirm?
diff --git a/tools/testing/kunit/kunit_config.py b/tools/testing/kunit/kunit_config.py index e75063d603b5..c407c7c6a2b0 100644 --- a/tools/testing/kunit/kunit_config.py +++ b/tools/testing/kunit/kunit_config.py @@ -81,6 +81,12 @@ class Kconfig(object): if line[0] == '#': continue + + if 'CONFIG_CC_VERSION_TEXT' in line: + name, value = line.split('=') + entry = KconfigEntry(name, value) + self.add_entry(entry) + continue else: raise KconfigParseError('Failed to parse: ' + line)
Commit 8b59cd81dc5 ("kbuild: ensure full rebuild when the compiler is updated") added the environment variable CC_VERSION_TEXT, parse_from_string() doesn't expect a string in value field and this causes the failure below: [iha@bbking linux]$ tools/testing/kunit/kunit.py run --timeout=60 [00:20:12] Configuring KUnit Kernel ... Generating .config ... Traceback (most recent call last): File "tools/testing/kunit/kunit.py", line 347, in <module> main(sys.argv[1:]) File "tools/testing/kunit/kunit.py", line 257, in main result = run_tests(linux, request) File "tools/testing/kunit/kunit.py", line 134, in run_tests config_result = config_tests(linux, config_request) File "tools/testing/kunit/kunit.py", line 64, in config_tests success = linux.build_reconfig(request.build_dir, request.make_options) File "/home/iha/lkmp/linux/tools/testing/kunit/kunit_kernel.py", line 161, in build_reconfig return self.build_config(build_dir, make_options) File "/home/iha/lkmp/linux/tools/testing/kunit/kunit_kernel.py", line 145, in build_config return self.validate_config(build_dir) File "/home/iha/lkmp/linux/tools/testing/kunit/kunit_kernel.py", line 124, in validate_config validated_kconfig.read_from_file(kconfig_path) File "/home/iha/lkmp/linux/tools/testing/kunit/kunit_config.py", line 89, in read_from_file self.parse_from_string(f.read()) File "/home/iha/lkmp/linux/tools/testing/kunit/kunit_config.py", line 85, in parse_from_string raise KconfigParseError('Failed to parse: ' + line) kunit_config.KconfigParseError: Failed to parse: CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.1.1 20200507 (Red Hat 10.1.1-1)" Signed-off-by: Vitor Massaru Iha <vitor@massaru.org> --- v2: - maintains CC_VERSION_TEXT in the .config file to ensure full rebuild when the compiler is updated. --- tools/testing/kunit/kunit_config.py | 6 ++++++ 1 file changed, 6 insertions(+) base-commit: 7bf200b3a4ac10b1b0376c70b8c66ed39eae7cdd