From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.7 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 42856C00A89 for ; Fri, 30 Oct 2020 19:49:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E4F0920729 for ; Fri, 30 Oct 2020 19:49:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726072AbgJ3TtW (ORCPT ); Fri, 30 Oct 2020 15:49:22 -0400 Received: from mga03.intel.com ([134.134.136.65]:1880 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726061AbgJ3TtW (ORCPT ); Fri, 30 Oct 2020 15:49:22 -0400 IronPort-SDR: WR/WOnFHrH9eNWcOdDw5QX+dlDDpQp1Hwf4AXlwh3MMrSuMTD302Sshjfy8a4LedrlN2Mq9cZ9 H2SmTPVMz95g== X-IronPort-AV: E=McAfee;i="6000,8403,9790"; a="168754613" X-IronPort-AV: E=Sophos;i="5.77,434,1596524400"; d="scan'208";a="168754613" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Oct 2020 12:49:21 -0700 IronPort-SDR: Nmx51BbKuAbWYp+ktEL9bFvB1BtK72PNhFejNP37Ns/e0Vz8aoAAxKubrYpDui3L+6koMl7aUa 8t+06vwMTikg== X-IronPort-AV: E=Sophos;i="5.77,434,1596524400"; d="scan'208";a="469622311" Received: from smile.fi.intel.com (HELO smile) ([10.237.68.40]) by orsmga004-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Oct 2020 12:49:19 -0700 Received: from andy by smile with local (Exim 4.94) (envelope-from ) id 1kYaPm-002SQD-BW; Fri, 30 Oct 2020 21:50:22 +0200 Date: Fri, 30 Oct 2020 21:50:22 +0200 From: Andy Shevchenko To: linux-kselftest@vger.kernel.org, Shuah Khan , kunit-dev@googlegroups.com, SeongJae Park Cc: Brendan Higgins Subject: Re: [PATCH v2 1/3] kunit: Do not pollute source directory with generated files (.kunitconfig) Message-ID: <20201030195022.GU4077@smile.fi.intel.com> References: <20201026165927.19020-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20201026165927.19020-1-andriy.shevchenko@linux.intel.com> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo Precedence: bulk List-ID: X-Mailing-List: linux-kselftest@vger.kernel.org On Mon, Oct 26, 2020 at 06:59:25PM +0200, Andy Shevchenko wrote: > When --build_dir is provided use it and do not pollute source directory > which even can be mounted over network or read-only. Can we get this applied? > Signed-off-by: Andy Shevchenko > Reviewed-by: Brendan Higgins > Tested-by: Brendan Higgins > --- > v2: renamed *_uniconfig -> *_kunitconfig (Brendan), added tags (Brendan) > tools/testing/kunit/kunit.py | 25 ++++++++++++------------- > tools/testing/kunit/kunit_kernel.py | 24 +++++++++++++++++++----- > 2 files changed, 31 insertions(+), 18 deletions(-) > > diff --git a/tools/testing/kunit/kunit.py b/tools/testing/kunit/kunit.py > index ebf5f5763dee..8cfeee98097f 100755 > --- a/tools/testing/kunit/kunit.py > +++ b/tools/testing/kunit/kunit.py > @@ -11,7 +11,6 @@ import argparse > import sys > import os > import time > -import shutil > > from collections import namedtuple > from enum import Enum, auto > @@ -44,11 +43,6 @@ class KunitStatus(Enum): > BUILD_FAILURE = auto() > TEST_FAILURE = auto() > > -def create_default_kunitconfig(): > - if not os.path.exists(kunit_kernel.kunitconfig_path): > - shutil.copyfile('arch/um/configs/kunit_defconfig', > - kunit_kernel.kunitconfig_path) > - > def get_kernel_root_path(): > parts = sys.argv[0] if not __file__ else __file__ > parts = os.path.realpath(parts).split('tools/testing/kunit') > @@ -61,7 +55,6 @@ def config_tests(linux: kunit_kernel.LinuxSourceTree, > kunit_parser.print_with_timestamp('Configuring KUnit Kernel ...') > > config_start = time.time() > - create_default_kunitconfig() > success = linux.build_reconfig(request.build_dir, request.make_options) > config_end = time.time() > if not success: > @@ -262,12 +255,12 @@ def main(argv, linux=None): > if not os.path.exists(cli_args.build_dir): > os.mkdir(cli_args.build_dir) > > - if not os.path.exists(kunit_kernel.kunitconfig_path): > - create_default_kunitconfig() > - > if not linux: > linux = kunit_kernel.LinuxSourceTree() > > + linux.create_kunitconfig(cli_args.build_dir) > + linux.read_kunitconfig(cli_args.build_dir) > + > request = KunitRequest(cli_args.raw_output, > cli_args.timeout, > cli_args.jobs, > @@ -283,12 +276,12 @@ def main(argv, linux=None): > not os.path.exists(cli_args.build_dir)): > os.mkdir(cli_args.build_dir) > > - if not os.path.exists(kunit_kernel.kunitconfig_path): > - create_default_kunitconfig() > - > if not linux: > linux = kunit_kernel.LinuxSourceTree() > > + linux.create_kunitconfig(cli_args.build_dir) > + linux.read_kunitconfig(cli_args.build_dir) > + > request = KunitConfigRequest(cli_args.build_dir, > cli_args.make_options) > result = config_tests(linux, request) > @@ -301,6 +294,9 @@ def main(argv, linux=None): > if not linux: > linux = kunit_kernel.LinuxSourceTree() > > + linux.create_kunitconfig(cli_args.build_dir) > + linux.read_kunitconfig(cli_args.build_dir) > + > request = KunitBuildRequest(cli_args.jobs, > cli_args.build_dir, > cli_args.alltests, > @@ -315,6 +311,9 @@ def main(argv, linux=None): > if not linux: > linux = kunit_kernel.LinuxSourceTree() > > + linux.create_kunitconfig(cli_args.build_dir) > + linux.read_kunitconfig(cli_args.build_dir) > + > exec_request = KunitExecRequest(cli_args.timeout, > cli_args.build_dir, > cli_args.alltests) > diff --git a/tools/testing/kunit/kunit_kernel.py b/tools/testing/kunit/kunit_kernel.py > index b557b1e93f98..633a2efcfdbd 100644 > --- a/tools/testing/kunit/kunit_kernel.py > +++ b/tools/testing/kunit/kunit_kernel.py > @@ -6,10 +6,10 @@ > # Author: Felix Guo > # Author: Brendan Higgins > > - > import logging > import subprocess > import os > +import shutil > import signal > > from contextlib import ExitStack > @@ -18,7 +18,8 @@ import kunit_config > import kunit_parser > > KCONFIG_PATH = '.config' > -kunitconfig_path = '.kunitconfig' > +KUNITCONFIG_PATH = '.kunitconfig' > +DEFAULT_KUNITCONFIG_PATH = 'arch/um/configs/kunit_defconfig' > BROKEN_ALLCONFIG_PATH = 'tools/testing/kunit/configs/broken_on_uml.config' > > class ConfigError(Exception): > @@ -99,19 +100,22 @@ class LinuxSourceTreeOperations(object): > stderr=subprocess.STDOUT) > process.wait(timeout) > > - > def get_kconfig_path(build_dir): > kconfig_path = KCONFIG_PATH > if build_dir: > kconfig_path = os.path.join(build_dir, KCONFIG_PATH) > return kconfig_path > > +def get_kunitconfig_path(build_dir): > + kunitconfig_path = KUNITCONFIG_PATH > + if build_dir: > + kunitconfig_path = os.path.join(build_dir, KUNITCONFIG_PATH) > + return kunitconfig_path > + > class LinuxSourceTree(object): > """Represents a Linux kernel source tree with KUnit tests.""" > > def __init__(self): > - self._kconfig = kunit_config.Kconfig() > - self._kconfig.read_from_file(kunitconfig_path) > self._ops = LinuxSourceTreeOperations() > signal.signal(signal.SIGINT, self.signal_handler) > > @@ -123,6 +127,16 @@ class LinuxSourceTree(object): > return False > return True > > + def create_kunitconfig(self, build_dir, defconfig=DEFAULT_KUNITCONFIG_PATH): > + kunitconfig_path = get_kunitconfig_path(build_dir) > + if not os.path.exists(kunitconfig_path): > + shutil.copyfile(defconfig, kunitconfig_path) > + > + def read_kunitconfig(self, build_dir): > + kunitconfig_path = get_kunitconfig_path(build_dir) > + self._kconfig = kunit_config.Kconfig() > + self._kconfig.read_from_file(kunitconfig_path) > + > def validate_config(self, build_dir): > kconfig_path = get_kconfig_path(build_dir) > validated_kconfig = kunit_config.Kconfig() > -- > 2.28.0 > -- With Best Regards, Andy Shevchenko