Commit e3212513 authored by SeongJae Park's avatar SeongJae Park Committed by Shuah Khan
Browse files

kunit: Create default config in '--build_dir' 



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.

Reported-by: default avatarBrendan Higgins <brendanhiggins@google.com>
Suggested-by: default avatarBrendan Higgins <brendanhiggins@google.com>
Signed-off-by: default avatarSeongJae Park <sjpark@amazon.de>
Reviewed-by: default avatarBrendan Higgins <brendanhiggins@google.com>
Tested-by: default avatarBrendan Higgins <brendanhiggins@google.com>
Signed-off-by: default avatarShuah Khan <skhan@linuxfoundation.org>
parent 8c0140fa

tools/testing/kunit/kunit.py

+9 −2
Original line number Diff line number Diff line
@@ -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()

tools/testing/kunit/kunit_kernel.py

+2 −2
Original line number Diff line number Diff line
@@ -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):

CRA Git | Maintained and supported by SUSTech CRA and CCSE