From: SeongJae Park <sjpark@amazon.com>
To: <brendanhiggins@google.com>
Cc: <sj38.park@gmail.com>, <corbet@lwn.net>,
<kunit-dev@googlegroups.com>, <linux-doc@vger.kernel.org>,
<linux-kernel@vger.kernel.org>, <linux-kselftest@vger.kernel.org>,
<shuah@kernel.org>, <sjpark@amazon.de>
Subject: [PATCH v5 3/6] kunit: Create default config in '--build_dir'
Date: Thu, 5 Dec 2019 10:34:37 +0100 [thread overview]
Message-ID: <20191205093440.21824-4-sjpark@amazon.com> (raw)
In-Reply-To: <20191205093440.21824-1-sjpark@amazon.com>
From: SeongJae Park <sjpark@amazon.de>
If both '--build_dir' and '--defconfig' are given, the handling of
'--defconfig' ignores '--build_dir' option. This commit modifies the
behavior to respect '--build_dir' option.
Signed-off-by: SeongJae Park <sjpark@amazon.de>
Suggested-by: Brendan Higgins <brendanhiggins@google.com>
Reported-by: Brendan Higgins <brendanhiggins@google.com>
---
tools/testing/kunit/kunit.py | 11 +++++++++--
tools/testing/kunit/kunit_kernel.py | 4 ++--
2 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/tools/testing/kunit/kunit.py b/tools/testing/kunit/kunit.py
index f8f26951cd1b..5b222418eacd 100755
--- a/tools/testing/kunit/kunit.py
+++ b/tools/testing/kunit/kunit.py
@@ -31,9 +31,9 @@ class KunitStatus(Enum):
TEST_FAILURE = auto()
def create_default_kunitconfig():
- if not os.path.exists(kunit_kernel.KUNITCONFIG_PATH):
+ if not os.path.exists(kunit_kernel.kunitconfig_path):
shutil.copyfile('arch/um/configs/kunit_defconfig',
- kunit_kernel.KUNITCONFIG_PATH)
+ kunit_kernel.kunitconfig_path)
def run_tests(linux: kunit_kernel.LinuxSourceTree,
request: KunitRequest) -> KunitResult:
@@ -114,6 +114,13 @@ def main(argv, linux=None):
cli_args = parser.parse_args(argv)
if cli_args.subcommand == 'run':
+ if cli_args.build_dir:
+ if not os.path.exists(cli_args.build_dir):
+ os.mkdir(cli_args.build_dir)
+ kunit_kernel.kunitconfig_path = os.path.join(
+ cli_args.build_dir,
+ kunit_kernel.kunitconfig_path)
+
if cli_args.defconfig:
create_default_kunitconfig()
diff --git a/tools/testing/kunit/kunit_kernel.py b/tools/testing/kunit/kunit_kernel.py
index bf3876835331..c04a12e2f711 100644
--- a/tools/testing/kunit/kunit_kernel.py
+++ b/tools/testing/kunit/kunit_kernel.py
@@ -14,7 +14,7 @@ import os
import kunit_config
KCONFIG_PATH = '.config'
-KUNITCONFIG_PATH = 'kunitconfig'
+kunitconfig_path = 'kunitconfig'
class ConfigError(Exception):
"""Represents an error trying to configure the Linux kernel."""
@@ -82,7 +82,7 @@ class LinuxSourceTree(object):
def __init__(self):
self._kconfig = kunit_config.Kconfig()
- self._kconfig.read_from_file(KUNITCONFIG_PATH)
+ self._kconfig.read_from_file(kunitconfig_path)
self._ops = LinuxSourceTreeOperations()
def clean(self):
--
2.17.1
next prev parent reply other threads:[~2019-12-05 9:35 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-05 9:34 [PATCH v5 0/6] Fix nits in the kunit SeongJae Park
2019-12-05 9:34 ` [PATCH v5 1/6] docs/kunit/start: Use in-tree 'kunit_defconfig' SeongJae Park
2019-12-05 9:34 ` [PATCH v5 2/6] kunit: Remove duplicated defconfig creation SeongJae Park
2019-12-05 9:34 ` SeongJae Park [this message]
2019-12-12 1:17 ` [PATCH v5 3/6] kunit: Create default config in '--build_dir' Brendan Higgins
2019-12-05 9:34 ` [PATCH v5 4/6] kunit: Place 'test.log' under the 'build_dir' SeongJae Park
2019-12-12 1:24 ` Brendan Higgins
2019-12-05 9:38 ` [PATCH v5 5/6] kunit: Rename 'kunitconfig' to '.kunitconfig' SeongJae Park
2019-12-05 9:38 ` [PATCH v5 6/6] kunit/kunit_tool_test: Test '--build_dir' option run SeongJae Park
2019-12-12 1:31 ` Brendan Higgins
2019-12-11 16:33 ` [PATCH v5 0/6] Fix nits in the kunit SeongJae Park
2019-12-11 17:22 ` shuah
2019-12-11 17:40 ` SeongJae Park
2019-12-11 17:45 ` Brendan Higgins
2019-12-12 2:06 ` Brendan Higgins
2019-12-12 2:12 ` SeongJae Park
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191205093440.21824-4-sjpark@amazon.com \
--to=sjpark@amazon.com \
--cc=brendanhiggins@google.com \
--cc=corbet@lwn.net \
--cc=kunit-dev@googlegroups.com \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=shuah@kernel.org \
--cc=sj38.park@gmail.com \
--cc=sjpark@amazon.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.