kunit: Do not pollute source directory with generated files (.kunitconfig)
PATCH v2 1/3 kunit: Do not pollute source directory with generated files (.kunitconfig)
When --build_dir is provided use it and do not pollute source directory which even can be mounted over network or read-only.
---
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(-)
tools/testing/kunit/kunit.py +12 -13
@@ -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)
tools/testing/kunit/kunit_kernel.py +19 -5
@@ -6,10 +6,10 @@ # Author: Felix Guo <[email protected]> # Author: Brendan Higgins <[email protected]> - 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()
Signature · 1 line
2.28.0
PATCH v2 2/3 kunit: Do not pollute source directory with generated files (test.log)
When --build_dir is provided use it and do not pollute source directory which even can be mounted over network or read-only.
---
v2: added tags (Brendan)
tools/testing/kunit/kunit_kernel.py | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-)
tools/testing/kunit/kunit_kernel.py +11 -3
@@ -21,6 +21,7 @@ KCONFIG_PATH = '.config' KUNITCONFIG_PATH = '.kunitconfig' DEFAULT_KUNITCONFIG_PATH = 'arch/um/configs/kunit_defconfig' BROKEN_ALLCONFIG_PATH = 'tools/testing/kunit/configs/broken_on_uml.config' +OUTFILE_PATH = 'test.log' class ConfigError(Exception): """Represents an error trying to configure the Linux kernel."""
@@ -89,11 +90,12 @@ class LinuxSourceTreeOperations(object): except subprocess.CalledProcessError as e: raise BuildError(e.output.decode()) - def linux_bin(self, params, timeout, build_dir, outfile): + def linux_bin(self, params, timeout, build_dir): """Runs the Linux UML binary. Must be named 'linux'.""" linux_bin = './linux' if build_dir: linux_bin = os.path.join(build_dir, 'linux') + outfile = get_outfile_path(build_dir) with open(outfile, 'w') as output: process = subprocess.Popen([linux_bin] + params, stdout=output,
@@ -112,6 +114,12 @@ def get_kunitconfig_path(build_dir): kunitconfig_path = os.path.join(build_dir, KUNITCONFIG_PATH) return kunitconfig_path +def get_outfile_path(build_dir): + outfile_path = OUTFILE_PATH + if build_dir: + outfile_path = os.path.join(build_dir, OUTFILE_PATH) + return outfile_path + class LinuxSourceTree(object): """Represents a Linux kernel source tree with KUnit tests."""
@@ -192,8 +200,8 @@ class LinuxSourceTree(object): def run_kernel(self, args=[], build_dir='', timeout=None): args.extend(['mem=1G']) - outfile = 'test.log' - self._ops.linux_bin(args, timeout, build_dir, outfile) + self._ops.linux_bin(args, timeout, build_dir) + outfile = get_outfile_path(build_dir) subprocess.call(['stty', 'sane']) with open(outfile, 'r') as file: for line in file:
Signature · 1 line
2.28.0
PATCH v2 3/3 kunit: Introduce get_file_path() helper
In reply to Andy ShevchenkoHelper allows to derive file names depending on --build_dir argument.
---
v2: added tags (Brendan)
tools/testing/kunit/kunit_kernel.py | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-)
tools/testing/kunit/kunit_kernel.py +9 -15
@@ -23,6 +23,11 @@ DEFAULT_KUNITCONFIG_PATH = 'arch/um/configs/kunit_defconfig' BROKEN_ALLCONFIG_PATH = 'tools/testing/kunit/configs/broken_on_uml.config' OUTFILE_PATH = 'test.log' +def get_file_path(build_dir, default): + if build_dir: + default = os.path.join(build_dir, default) + return default + class ConfigError(Exception): """Represents an error trying to configure the Linux kernel."""
@@ -92,9 +97,7 @@ class LinuxSourceTreeOperations(object): def linux_bin(self, params, timeout, build_dir): """Runs the Linux UML binary. Must be named 'linux'.""" - linux_bin = './linux' - if build_dir: - linux_bin = os.path.join(build_dir, 'linux') + linux_bin = get_file_path(build_dir, 'linux') outfile = get_outfile_path(build_dir) with open(outfile, 'w') as output: process = subprocess.Popen([linux_bin] + params,
@@ -103,22 +106,13 @@ class LinuxSourceTreeOperations(object): 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 + return get_file_path(build_dir, 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 + return get_file_path(build_dir, KUNITCONFIG_PATH) def get_outfile_path(build_dir): - outfile_path = OUTFILE_PATH - if build_dir: - outfile_path = os.path.join(build_dir, OUTFILE_PATH) - return outfile_path + return get_file_path(build_dir, OUTFILE_PATH) class LinuxSourceTree(object): """Represents a Linux kernel source tree with KUnit tests."""
Signature · 1 line
2.28.0
A message that is not in the archive (sent off-list or not yet received): [email protected]
Re: [PATCH v2 3/3] kunit: Introduce get_file_path() helper
Quoted 9 lines · SeongJae Park
Quoted 5 lines · On Mon, 26 Oct 2020 18:59:27 +0200 Andy Shevchenko…
Helper allows to derive file names depending on --build_dir argument.
Signed-off-by Andy Shevchenko <[email protected]>Reviewed-by Brendan Higgins <[email protected]>Tested-by Brendan Higgins <[email protected]>Reviewed-by SeongJae Park <[email protected]>
Thanks!
Brendan, Shuah, can we get this series applied, please?
Signature · 2 lines
With Best Regards, Andy Shevchenko
Re: [PATCH v2 3/3] kunit: Introduce get_file_path() helper
Quoted 10 lines · Andy Shevchenko
Quoted 8 lines · SeongJae Park
Quoted 5 lines · On Mon, 26 Oct 2020 18:59:27 +0200 Andy Shevchenko…
Helper allows to derive file names depending on --build_dir argument.
Signed-off-by Andy Shevchenko <[email protected]>Reviewed-by Brendan Higgins <[email protected]>Tested-by Brendan Higgins <[email protected]>
Quoted 5 lines
Quoted 1 line
Reviewed-by SeongJae Park <[email protected]>Thanks!
Brendan, Shuah, can we get this series applied, please?
I'm not actually sure that this qualifies as a fix. I certainly don't mind if this goes in 5.10, in fact, I would prefer it.
In any case, I added it to Shuah's queue. I will leave it up to Shuah whether it goes in as a fix in 5.10, or needs to wait for the next merge window.
Re: [PATCH v2 3/3] kunit: Introduce get_file_path() helper
Quoted 15 lines · Brendan Higgins
Quoted 13 lines · Andy Shevchenko
Quoted 9 lines · SeongJae Park
Quoted 5 lines · On Mon, 26 Oct 2020 18:59:27 +0200 Andy Shevchenko…
Helper allows to derive file names depending on --build_dir argument.
Signed-off-by Andy Shevchenko <[email protected]>Reviewed-by Brendan Higgins <[email protected]>Tested-by Brendan Higgins <[email protected]>Reviewed-by SeongJae Park <[email protected]>Thanks!
Quoted 8 lines
Quoted 1 line
Brendan, Shuah, can we get this series applied, please?
I'm not actually sure that this qualifies as a fix. I certainly don't mind if this goes in 5.10, in fact, I would prefer it.
In any case, I added it to Shuah's queue. I will leave it up to Shuah whether it goes in as a fix in 5.10, or needs to wait for the next merge window.
I'm fine with either. My solely concern is that I would like to get this moved forward somehow.
Signature · 2 lines
With Best Regards, Andy Shevchenko
Shuah Khan
maintainerRe: [PATCH v2 3/3] kunit: Introduce get_file_path() helper
Quoted 21 lines · Andy Shevchenko
Quoted 20 lines · Brendan Higgins
Quoted 9 lines · Andy Shevchenko
Quoted 8 lines · SeongJae Park
Quoted 5 lines · On Mon, 26 Oct 2020 18:59:27 +0200 Andy Shevchenko…
Helper allows to derive file names depending on --build_dir argument.
Signed-off-by Andy Shevchenko <[email protected]>Reviewed-by Brendan Higgins <[email protected]>Tested-by Brendan Higgins <[email protected]>Quoted 5 lines
Quoted 1 line
Reviewed-by SeongJae Park <[email protected]>Thanks!
Brendan, Shuah, can we get this series applied, please?
I'm not actually sure that this qualifies as a fix. I certainly don't mind if this goes in 5.10, in fact, I would prefer it.
Quoted 7 lines
Quoted 3 lines
In any case, I added it to Shuah's queue. I will leave it up to Shuah whether it goes in as a fix in 5.10, or needs to wait for the next merge window.
I'm fine with either. My solely concern is that I would like to get this moved forward somehow.
Once the kunit pull request for rc3 clears, I will look at these and make a call. This patch series finalized during the merge window, hence you are going to see some delays. If it doesn't make the cut for fixes, it will go into 5.11
thanks,
-- Shuah
Shuah Khan
maintainerRe: [PATCH v2 3/3] kunit: Introduce get_file_path() helper
Quoted 15 lines · Shuah Khan
Quoted 14 lines · Andy Shevchenko
Quoted 13 lines · Brendan Higgins
Quoted 11 lines · Andy Shevchenko
Quoted 9 lines · SeongJae Park
Quoted 5 lines · On Mon, 26 Oct 2020 18:59:27 +0200 Andy Shevchenko…
Helper allows to derive file names depending on --build_dir argument.
Signed-off-by Andy Shevchenko <[email protected]>Reviewed-by Brendan Higgins <[email protected]>Tested-by Brendan Higgins <[email protected]>Reviewed-by SeongJae Park <[email protected]>
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 3 lines
Thanks!
Brendan, Shuah, can we get this series applied, please?
I'm not actually sure that this qualifies as a fix. I certainly don't mind if this goes in 5.10, in fact, I would prefer it.
3/3 will go into 5.11.
Quoted 4 lines
Quoted 4 lines
Quoted 3 lines
In any case, I added it to Shuah's queue. I will leave it up to Shuah whether it goes in as a fix in 5.10, or needs to wait for the next merge window.
Quoted 9 lines
Quoted 3 lines
I'm fine with either. My solely concern is that I would like to get this moved forward somehow.
Once the kunit pull request for rc3 clears, I will look at these and make a call. This patch series finalized during the merge window, hence you are going to see some delays. If it doesn't make the cut for fixes, it will go into 5.11
Applied 1/3 and 2/3 to
https://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git/ kuni-fixes branch.
I will send them up in my next pull request, probably rc5.
thanks,
-- Shuah
Re: [PATCH v2 3/3] kunit: Introduce get_file_path() helper
Quoted 1 line · Shuah Khan
On 11/5/20 10:56 AM, Shuah Khan wrote:
...
Quoted 4 lines
https://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git/
kuni-fixes branch.I will send them up in my next pull request, probably rc5.
Thank you!
Signature · 2 lines
With Best Regards, Andy Shevchenko
Quoted 2 lines · Andy Shevchenko
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?
Quoted 165 lines
Signed-off-by Andy Shevchenko <[email protected]>Reviewed-by Brendan Higgins <[email protected]>Tested-by Brendan Higgins <[email protected]>---
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(-)tools/testing/kunit/kunit.py +12
-13@@ -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)tools/testing/kunit/kunit_kernel.py +19
-5@@ -6,10 +6,10 @@ # Author: Felix Guo <[email protected]> # Author: Brendan Higgins <[email protected]> - 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()Signature · 1 line
2.28.0
Signature · 2 lines
With Best Regards, Andy Shevchenko