2020-07-29 02:46:19

by Marcelo Schmitt

Subject: [PATCH] kunit: tool: adjust parse regex

kunit config subcommand terminates with error if .config has a
configuration assigned with a string, for instance:

CONFIG_CC_VERSION_TEXT="gcc (distro package version) ..."

This patch adjusts the parse regex to consider such string assignments.

Signed-off-by: Marcelo Schmitt <[email protected]>
---
tools/testing/kunit/kunit_config.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/testing/kunit/kunit_config.py b/tools/testing/kunit/kunit_config.py
index e75063d603b5..8e55693fe812 100644
--- a/tools/testing/kunit/kunit_config.py
+++ b/tools/testing/kunit/kunit_config.py
@@ -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'])

--
2.27.0

2020-07-29 02:59:16

by David Gow

Subject: Re: [PATCH] kunit: tool: adjust parse regex

On Wed, Jul 29, 2020 at 10:42 AM Marcelo Schmitt
<[email protected]> wrote:
>
> kunit config subcommand terminates with error if .config has a
> configuration assigned with a string, for instance:
>
> CONFIG_CC_VERSION_TEXT="gcc (distro package version) ..."
>
> This patch adjusts the parse regex to consider such string assignments.
>
> Signed-off-by: Marcelo Schmitt <[email protected]>
> ---

Thanks, Marcelo.

I think we've actually already got a fix for this upstream:
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=3f37d14b8a3152441f36b6bc74000996679f0998

Cheers,
-- David