* [PATCH] kunit: fix KconfigParseError by ignoring CC_VERSION_TEXT
@ 2020-06-18 3:57 Vitor Massaru Iha
2020-06-18 20:29 ` Brendan Higgins
0 siblings, 1 reply; 3+ messages in thread
From: Vitor Massaru Iha @ 2020-06-18 3:57 UTC (permalink / raw)
To: kunit-dev
Cc: skhan, linux-kselftest, linux-kernel, brendanhiggins,
linux-kernel-mentees
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 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>
---
tools/testing/kunit/kunit_config.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/tools/testing/kunit/kunit_config.py b/tools/testing/kunit/kunit_config.py
index e75063d603b5..3033520597b6 100644
--- a/tools/testing/kunit/kunit_config.py
+++ b/tools/testing/kunit/kunit_config.py
@@ -9,6 +9,7 @@
import collections
import re
+CONFIG_IGNORE_CC_VERSION_TEXT = 'CONFIG_CC_VERSION_TEXT'
CONFIG_IS_NOT_SET_PATTERN = r'^# CONFIG_(\w+) is not set$'
CONFIG_PATTERN = r'^CONFIG_(\w+)=(\S+)$'
@@ -79,7 +80,7 @@ class Kconfig(object):
self.add_entry(entry)
continue
- if line[0] == '#':
+ if line[0] == '#' or CONFIG_IGNORE_CC_VERSION_TEXT in line:
continue
else:
raise KconfigParseError('Failed to parse: ' + line)
base-commit: 7bf200b3a4ac10b1b0376c70b8c66ed39eae7cdd
--
2.26.2
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] kunit: fix KconfigParseError by ignoring CC_VERSION_TEXT
2020-06-18 3:57 [PATCH] kunit: fix KconfigParseError by ignoring CC_VERSION_TEXT Vitor Massaru Iha
@ 2020-06-18 20:29 ` Brendan Higgins
2020-06-18 20:36 ` Vitor Massaru Iha
0 siblings, 1 reply; 3+ messages in thread
From: Brendan Higgins @ 2020-06-18 20:29 UTC (permalink / raw)
To: Vitor Massaru Iha
Cc: KUnit Development, Shuah Khan,
open list:KERNEL SELFTEST FRAMEWORK, Linux Kernel Mailing List,
linux-kernel-mentees
On Wed, Jun 17, 2020 at 8:57 PM 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 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?
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] kunit: fix KconfigParseError by ignoring CC_VERSION_TEXT
2020-06-18 20:29 ` Brendan Higgins
@ 2020-06-18 20:36 ` Vitor Massaru Iha
0 siblings, 0 replies; 3+ messages in thread
From: Vitor Massaru Iha @ 2020-06-18 20:36 UTC (permalink / raw)
To: Brendan Higgins
Cc: KUnit Development, Shuah Khan,
open list:KERNEL SELFTEST FRAMEWORK, Linux Kernel Mailing List,
linux-kernel-mentees
On Thu, 2020-06-18 at 13:29 -0700, Brendan Higgins wrote:
> On Wed, Jun 17, 2020 at 8:57 PM 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 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?
Sure, thanks!
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-06-18 20:36 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-06-18 3:57 [PATCH] kunit: fix KconfigParseError by ignoring CC_VERSION_TEXT Vitor Massaru Iha
2020-06-18 20:29 ` Brendan Higgins
2020-06-18 20:36 ` Vitor Massaru Iha
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).