mirror of https://github.com/ARMmbed/mbed-os.git
Prevent traceback
parent
a0c8a09c89
commit
163fa59e17
|
@ -36,7 +36,7 @@ from tools.build_api import mcu_toolchain_matrix
|
||||||
from tools.build_api import static_analysis_scan, static_analysis_scan_lib, static_analysis_scan_library
|
from tools.build_api import static_analysis_scan, static_analysis_scan_lib, static_analysis_scan_library
|
||||||
from tools.build_api import print_build_results
|
from tools.build_api import print_build_results
|
||||||
from tools.settings import CPPCHECK_CMD, CPPCHECK_MSG_FORMAT
|
from tools.settings import CPPCHECK_CMD, CPPCHECK_MSG_FORMAT
|
||||||
from utils import argparse_filestring_type
|
from utils import argparse_filestring_type, args_error
|
||||||
from tools.settings import CPPCHECK_CMD, CPPCHECK_MSG_FORMAT, CLI_COLOR_MAP
|
from tools.settings import CPPCHECK_CMD, CPPCHECK_MSG_FORMAT, CLI_COLOR_MAP
|
||||||
from utils import argparse_filestring_type, argparse_dir_not_parent
|
from utils import argparse_filestring_type, argparse_dir_not_parent
|
||||||
|
|
||||||
|
@ -167,6 +167,9 @@ if __name__ == '__main__':
|
||||||
# Get toolchains list
|
# Get toolchains list
|
||||||
toolchains = options.tool if options.tool else TOOLCHAINS
|
toolchains = options.tool if options.tool else TOOLCHAINS
|
||||||
|
|
||||||
|
if options.source_dir and not options.build_dir:
|
||||||
|
args_error(parser, "argument --build is required by argument --source")
|
||||||
|
|
||||||
if options.color:
|
if options.color:
|
||||||
# This import happens late to prevent initializing colorization when we don't need it
|
# This import happens late to prevent initializing colorization when we don't need it
|
||||||
import colorize
|
import colorize
|
||||||
|
|
|
@ -212,9 +212,15 @@ if __name__ == '__main__':
|
||||||
|
|
||||||
# Toolchain
|
# Toolchain
|
||||||
if options.tool is None:
|
if options.tool is None:
|
||||||
args_error(parser, "argument -t/--toolchain is required")
|
args_error(parser, "argument -t/--tool is required")
|
||||||
toolchain = options.tool[0]
|
toolchain = options.tool[0]
|
||||||
|
|
||||||
|
if (options.program is None) and (not options.source_dir):
|
||||||
|
args_error(parser, "one of -p, -n, or --source is required")
|
||||||
|
|
||||||
|
if options.source_dir and not options.build_dir:
|
||||||
|
args_error(parser, "argument --build is required when argument --source is provided")
|
||||||
|
|
||||||
if options.color:
|
if options.color:
|
||||||
# This import happens late to prevent initializing colorization when we don't need it
|
# This import happens late to prevent initializing colorization when we don't need it
|
||||||
import colorize
|
import colorize
|
||||||
|
|
|
@ -13,7 +13,7 @@ from tools.tests import TESTS, TEST_MAP
|
||||||
from tools.tests import test_known, test_name_known
|
from tools.tests import test_known, test_name_known
|
||||||
from tools.targets import TARGET_NAMES
|
from tools.targets import TARGET_NAMES
|
||||||
from tools.libraries import LIBRARIES
|
from tools.libraries import LIBRARIES
|
||||||
from utils import argparse_filestring_type, argparse_many
|
from utils import argparse_filestring_type, argparse_many, args_error
|
||||||
from utils import argparse_force_lowercase_type, argparse_force_uppercase_type, argparse_dir_not_parent
|
from utils import argparse_force_lowercase_type, argparse_force_uppercase_type, argparse_dir_not_parent
|
||||||
from project_api import setup_project, perform_export, print_results, get_lib_symbols
|
from project_api import setup_project, perform_export, print_results, get_lib_symbols
|
||||||
|
|
||||||
|
@ -131,6 +131,16 @@ if __name__ == '__main__':
|
||||||
|
|
||||||
# source_dir = use relative paths, otherwise sources are copied
|
# source_dir = use relative paths, otherwise sources are copied
|
||||||
sources_relative = True if options.source_dir else False
|
sources_relative = True if options.source_dir else False
|
||||||
|
# Target
|
||||||
|
if not options.mcu:
|
||||||
|
args_error(parser, "argument -m/--mcu is required")
|
||||||
|
|
||||||
|
# Toolchain
|
||||||
|
if not options.ide:
|
||||||
|
args_error(parser, "argument -i is required")
|
||||||
|
|
||||||
|
if (options.program is None) and (not options.source_dir):
|
||||||
|
args_error(parser, "one of -p, -n, or --source is required")
|
||||||
|
|
||||||
for mcu in options.mcu:
|
for mcu in options.mcu:
|
||||||
# Program Number or name
|
# Program Number or name
|
||||||
|
|
|
@ -112,7 +112,7 @@ if __name__ == '__main__':
|
||||||
|
|
||||||
# Toolchain
|
# Toolchain
|
||||||
if options.tool is None:
|
if options.tool is None:
|
||||||
args_error(parser, "argument -t/--toolchain is required")
|
args_error(parser, "argument -t/--tool is required")
|
||||||
toolchain = options.tool[0]
|
toolchain = options.tool[0]
|
||||||
|
|
||||||
# Find all tests in the relevant paths
|
# Find all tests in the relevant paths
|
||||||
|
@ -152,8 +152,7 @@ if __name__ == '__main__':
|
||||||
else:
|
else:
|
||||||
# Build all tests
|
# Build all tests
|
||||||
if not options.build_dir:
|
if not options.build_dir:
|
||||||
print "[ERROR] You must specify a build path"
|
args_error(parser, "argument --build is required")
|
||||||
sys.exit(1)
|
|
||||||
|
|
||||||
base_source_paths = options.source_dir
|
base_source_paths = options.source_dir
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue