michaelh/zephyr
1
0
Fork 0
Code Releases Activity

west: build: fail early if path to test item is not valid

Browse source 
Fail early in case the path to the test item (--test-item) is not valid
or does not exist.

Signed-off-by: Anas Nashif <anas.nashif@intel.com>
This commit is contained in:
Anas Nashif 2023-08-23 10:28:49 +00:00 • committed by Martí Bolívar
commit d4b0c48892
1 changed files with 20 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

36
scripts/west_commands/build.py
View file

@ -166,10 +166,13 @@ class Build(Forceable):
# we get path + testitem # we get path + testitem
item = os.path.basename(self.args.test_item) item = os.path.basename(self.args.test_item)
test_path = os.path.dirname(self.args.test_item) test_path = os.path.dirname(self.args.test_item)
if test_path: if test_path and os.path.exists(test_path):
self.args.source_dir = test_path self.args.source_dir = test_path
if not self._parse_test_item(item): if not self._parse_test_item(item):
log.die("No test metadata found") log.die("No test metadata found")
else:
log.die("test item path does not exist")
if source_dir: if source_dir:
if self.args.source_dir: if self.args.source_dir:
log.die("source directory specified twice:({} and {})".format( log.die("source directory specified twice:({} and {})".format(
@ -322,22 +325,23 @@ class Build(Forceable):
self.args.sysbuild = sysbuild self.args.sysbuild = sysbuild
args = [] if found_test_metadata:
if extra_conf_files: args = []
args.append(f"CONF_FILE=\"{';'.join(extra_conf_files)}\"") if extra_conf_files:
args.append(f"CONF_FILE=\"{';'.join(extra_conf_files)}\"")
if extra_dtc_overlay_files: if extra_dtc_overlay_files:
args.append(f"DTC_OVERLAY_FILE=\"{';'.join(extra_dtc_overlay_files)}\"") args.append(f"DTC_OVERLAY_FILE=\"{';'.join(extra_dtc_overlay_files)}\"")
if extra_overlay_confs: if extra_overlay_confs:
args.append(f"OVERLAY_CONFIG=\"{';'.join(extra_overlay_confs)}\"") args.append(f"OVERLAY_CONFIG=\"{';'.join(extra_overlay_confs)}\"")
# Build the final argument list # Build the final argument list
args_expanded = ["-D{}".format(a.replace('"', '')) for a in args] args_expanded = ["-D{}".format(a.replace('"', '')) for a in args]
if self.args.cmake_opts: if self.args.cmake_opts:
self.args.cmake_opts.extend(args_expanded) self.args.cmake_opts.extend(args_expanded)
else: else:
self.args.cmake_opts = args_expanded self.args.cmake_opts = args_expanded
return found_test_metadata return found_test_metadata