]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commitdiff
kunit: kunit_config: Fix parsing of CONFIG options with space
authorRikard Falkeborn <rikard.falkeborn@gmail.com>
Sun, 7 Jun 2020 21:57:15 +0000 (23:57 +0200)
committerShuah Khan <skhan@linuxfoundation.org>
Fri, 26 Jun 2020 20:27:35 +0000 (14:27 -0600)
Commit 8b59cd81dc5e ("kbuild: ensure full rebuild when the compiler is
updated") introduced a new CONFIG option CONFIG_CC_VERSION_TEXT. On my
system, this is set to "gcc (GCC) 10.1.0" which breaks KUnit config
parsing which did not like the spaces in the string.

Fix this by updating the regex to allow strings containing spaces.

Fixes: 8b59cd81dc5e ("kbuild: ensure full rebuild when the compiler is updated")
Signed-off-by: Rikard Falkeborn <rikard.falkeborn@gmail.com>
Reviewed-by: Brendan Higgins <brendanhiggins@google.com>
Signed-off-by: Shuah Khan <skhan@linuxfoundation.org>
tools/testing/kunit/kunit_config.py

index e75063d603b5be152fe1c66c74180326effe09ca..02ffc3a3e5dc7f4b85156de813460ee89847fa61 100644 (file)
@@ -10,7 +10,7 @@ import collections
 import re
 
 CONFIG_IS_NOT_SET_PATTERN = r'^# CONFIG_(\w+) is not set$'
-CONFIG_PATTERN = r'^CONFIG_(\w+)=(\S+)$'
+CONFIG_PATTERN = r'^CONFIG_(\w+)=(\S+|".*")$'
 
 KconfigEntryBase = collections.namedtuple('KconfigEntry', ['name', 'value'])