Received: by 2002:a25:683:0:0:0:0:0 with SMTP id 125csp3913360ybg; Sun, 7 Jun 2020 14:59:30 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzW1M8cf7vmBm1ZLRXWLBFyNWiqPQZfYfY/dV9IrJkpNTXpCLl300F9SagjjQRvy7VOtzDr X-Received: by 2002:a50:ee18:: with SMTP id g24mr19628134eds.370.1591567170623; Sun, 07 Jun 2020 14:59:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1591567170; cv=none; d=google.com; s=arc-20160816; b=M5Q5s3lOUg9Gb/Sf/Iwlg+ViYjc1Y4i1J15h9AbH5aS4JFGIq12w00xFg9B4ULOXqN YkQEThb1orCJwtabc9l47Ypgpulh2xhDkjXiSACWlfqVQnrs1iMV2Hp3j1aoixiz0IbY 7jijgWtfustWd6fuvpd+NG4OIwDeMvyMqgPwR5J7hYDlLXJ19414p48D//SzEWD1Veb5 UZ74NwYlmiSruDllFhJ/eu4Zyhuu0XKf8fRefiwsNaRd3AwxRopSv+2SaZYZipKE8Hrd Kqmzew6IoTn9E5PWoN+LeWWGozNoaLmZTct17nrURo5npIfnxsjMUA8ZcDuhvNln6pnn 4jMA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=tqzE13DBGUWBWdCJ5g5XYcpEIrvBncjQd6Y+cm1LVm0=; b=mqaxwJBw6uMF20XbM9cGT+MdFjBSz/IubWvhVD4pwGqhYCmPYvwpxE5qFvD/Jf0+O2 AOZvDlyChuG0QjOvrLEZ3Q2+qlyebUJNWcGxQ1y4GYKY7Hk8SjapVzA+FzAh3PXQRyeo q6gayfy7JpGapqyUQWdaT4a7w37N65D0Z+orCjdwemDGWoYIUBfr7naWdo9DlEFD80eZ 1noU005fQZ5m8Y9LP4hdEB4UkoH7PQtDrJ0d8SkoIne7POl7nqoGBcZteqdrC/5bTXZs DywUW3gEWGAYLTCl1EsXe8ZpfBLm5CsGsbEJrvKYPb5wUhit3olJv07GwmPY7+Z/g6dD Pf/A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=A1kcJcX9; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id l4si8019942edi.316.2020.06.07.14.59.08; Sun, 07 Jun 2020 14:59:30 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=A1kcJcX9; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727914AbgFGV5Y (ORCPT + 99 others); Sun, 7 Jun 2020 17:57:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58460 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726833AbgFGV5Y (ORCPT ); Sun, 7 Jun 2020 17:57:24 -0400 Received: from mail-lj1-x243.google.com (mail-lj1-x243.google.com [IPv6:2a00:1450:4864:20::243]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 82DD5C08C5C3; Sun, 7 Jun 2020 14:57:23 -0700 (PDT) Received: by mail-lj1-x243.google.com with SMTP id j18so5006539lji.2; Sun, 07 Jun 2020 14:57:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=tqzE13DBGUWBWdCJ5g5XYcpEIrvBncjQd6Y+cm1LVm0=; b=A1kcJcX9iH7BYSCidWQt8QJqrhpVkHmiMEn2kXteAL6QaN5K00uDeWRQas5Gw/ftHH WH2IU1ymgjSDYDOdC9iLXN8Hs+7lXvDbE7M8+REwhu6Mo9GDNCkGTU908xQa61FjlPMN iL0NNQALqkuSzQI3TzrdfMyuD9ccumhZXWsqM/VYB1czUV/FFPNq5t9jZlwXy5dQqrxr IOFxdcIhLTxCmeMk+hSmdjE5TuHLlfyhLTj19MpCZ1IuALCjIL3qEMZdDWTg+jbS8ka/ c7fPjoxSDBlfZQsciVe9fGZrVqG7Juoz1jGsCEbAI/fjNlZzEM/bFZfEzq3/lDjgBAgt pcmg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=tqzE13DBGUWBWdCJ5g5XYcpEIrvBncjQd6Y+cm1LVm0=; b=oLEQjr/CTc2L8WA6NLGXestHqqGnrHN3PEXLYNSgKyfZXryJA9jKNs7pQFyIdbFEIM CVxEUnG7sWQ9F+Uicwtyl8sCyZrPV+Rmpqw/JXgWQEV22qi0g6eeIqP0jS6s2M/60FCI OR6T+MzOqAXdEk0xaoAQpnWLHP1UAB4bEkizwFAMn5lgEk6DzpVNg8HQYW5GqJA7tODJ pMEFR6rPZgJFMUoI9Y1i1q2Dr+TOiyzIRhKpTcqes/CEkaI6DnKC0A8iJ/6ag+g2wvbv Wpm8fpITHwce6+QOECreBxqYvvuKkpEdYGqpnWClE7dUjU7GRLgVvjiWUq778DkVoOz3 Lksw== X-Gm-Message-State: AOAM531lzXNK86UD2PQYApxT/LiARNcGsznMlTqNNWChWMJO6yw42Ndh +nEfj9+GS2N6cU0IXNPM72PNO7USWYc= X-Received: by 2002:a2e:b5bc:: with SMTP id f28mr8785854ljn.451.1591567041703; Sun, 07 Jun 2020 14:57:21 -0700 (PDT) Received: from localhost.localdomain (h-82-196-111-136.NA.cust.bahnhof.se. [82.196.111.136]) by smtp.gmail.com with ESMTPSA id l14sm3897804lfk.30.2020.06.07.14.57.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 07 Jun 2020 14:57:21 -0700 (PDT) From: Rikard Falkeborn To: linux-kselftest@vger.kernel.org Cc: brendanhiggins@google.com, masahiroy@kernel.org, linux-kernel@vger.kernel.org, Rikard Falkeborn Subject: [PATCH] kunit: kunit_config: Fix parsing of CONFIG options with space Date: Sun, 7 Jun 2020 23:57:15 +0200 Message-Id: <20200607215715.90981-1-rikard.falkeborn@gmail.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- Maybe it would have been sufficient to just use CONFIG_PATTERN = r'^CONFIG_(\w+)=(.*)$' instead? 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..02ffc3a3e5dc 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