Merge pull request #3274 from bridadan/fix-path-detection-test-building

Passing toolchain path info to subprocesses
pull/3322/head
Martin Kojtal 2016-11-29 18:13:00 +01:00 committed by GitHub
commit b36025f988
1 changed files with 8 additions and 1 deletions

View File

@ -2092,6 +2092,12 @@ def build_test_worker(*args, **kwargs):
'kwargs': kwargs 'kwargs': kwargs
} }
# Use parent TOOLCHAIN_PATHS variable
for key, value in kwargs['toolchain_paths'].iteritems():
TOOLCHAIN_PATHS[key] = value
del kwargs['toolchain_paths']
try: try:
bin_file = build_project(*args, **kwargs) bin_file = build_project(*args, **kwargs)
ret['result'] = True ret['result'] = True
@ -2165,7 +2171,8 @@ def build_tests(tests, base_source_paths, build_path, target, toolchain_name,
'verbose': verbose, 'verbose': verbose,
'app_config': app_config, 'app_config': app_config,
'build_profile': build_profile, 'build_profile': build_profile,
'silent': True 'silent': True,
'toolchain_paths': TOOLCHAIN_PATHS
} }
results.append(p.apply_async(build_test_worker, args, kwargs)) results.append(p.apply_async(build_test_worker, args, kwargs))