ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Removed exit(-1) when checking for missing modules. Instead now it will be prompted to used when singletest starts

pull/570/head
Przemek Wirkus 2014-10-16 14:34:11 +01:00
parent a40d0bb4ca
commit 7935e0f5ea
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
workspace_tools/singletest.py
View File

@ -57,10 +57,7 @@ sys.path.insert(0, ROOT)
# Check: Extra modules which are required by core test suite # Check: Extra modules which are required by core test suite
from workspace_tools.utils import check_required_modules from workspace_tools.utils import check_required_modules
check_required_modules(['prettytable', 'serial'])
if not check_required_modules(['prettytable', 'serial']):
exit(-1)
# Imports related to mbed build api # Imports related to mbed build api
from workspace_tools.build_api import mcu_toolchain_matrix from workspace_tools.build_api import mcu_toolchain_matrix

4
workspace_tools/utils.py
View File

@ -115,8 +115,8 @@ def check_required_modules(required_modules, verbose=True):
all_modules_found = False all_modules_found = False
not_installed_modules.append(module_name) not_installed_modules.append(module_name)
if verbose: if verbose:
print "Error message: %s"% e print "Error: %s"% e
if verbose: if verbose:
if not all_modules_found: if not all_modules_found:
print "Module(s) %s not installed. Please install required module(s) before using this script."% (', '.join(not_installed_modules)) print "Warning: Module(s) %s not installed. Please install required module(s) before using this script."% (', '.join(not_installed_modules))
return all_modules_found return all_modules_found