ToolException catch added when executing tests in execute() function

pull/475/head
Przemek Wirkus 2014-09-02 11:11:47 +01:00
parent 9c6dd060dc
commit 3a02126bd6
1 changed files with 16 additions and 13 deletions

View File

@ -40,6 +40,7 @@ from workspace_tools.tests import TESTS
from workspace_tools.tests import TEST_MAP from workspace_tools.tests import TEST_MAP
from workspace_tools.paths import BUILD_DIR from workspace_tools.paths import BUILD_DIR
from workspace_tools.paths import HOST_TESTS from workspace_tools.paths import HOST_TESTS
from workspace_tools.utils import ToolException
from workspace_tools.utils import construct_enum from workspace_tools.utils import construct_enum
from workspace_tools.targets import TARGET_MAP from workspace_tools.targets import TARGET_MAP
from workspace_tools.test_db import BaseDBAccess from workspace_tools.test_db import BaseDBAccess
@ -363,19 +364,21 @@ class SingleTestRunner(object):
MACROS.extend(LIBRARY_MAP[lib_id]['macros']) MACROS.extend(LIBRARY_MAP[lib_id]['macros'])
project_name = self.opts_firmware_global_name if self.opts_firmware_global_name else None project_name = self.opts_firmware_global_name if self.opts_firmware_global_name else None
path = build_project(test.source_dir, try:
join(build_dir, test_id), path = build_project(test.source_dir,
T, join(build_dir, test_id),
toolchain, T,
test.dependencies, toolchain,
options=build_project_options, test.dependencies,
clean=clean_project_options, options=build_project_options,
verbose=self.opts_verbose, clean=clean_project_options,
name=project_name, verbose=self.opts_verbose,
macros=MACROS, name=project_name,
inc_dirs=INC_DIRS, macros=MACROS,
jobs=self.opts_jobs) inc_dirs=INC_DIRS,
jobs=self.opts_jobs)
except ToolException:
return test_summary, self.shuffle_random_seed
if self.opts_only_build_tests: if self.opts_only_build_tests:
# With this option we are skipping testing phase # With this option we are skipping testing phase
continue continue