Skip to content

Commit 33558d3

Browse files
committed
Merge pull request #1425 from bridadan/lib-dep-build-order-fix
Fix for issue with libraries being built out of order
2 parents b4234e0 + 0657050 commit 33558d3

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

workspace_tools/test_api.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -388,15 +388,15 @@ def execute_thread_slice(self, q, target, toolchains, clean, test_ids, build_rep
388388

389389

390390
# First pass through all tests and determine which libraries need to be built
391-
libraries = set()
391+
libraries = []
392392
for test_id in valid_test_map_keys:
393393
test = TEST_MAP[test_id]
394394

395395
# Detect which lib should be added to test
396396
# Some libs have to compiled like RTOS or ETH
397397
for lib in LIBRARIES:
398-
if lib['build_dir'] in test.dependencies:
399-
libraries.add(lib['id'])
398+
if lib['build_dir'] in test.dependencies and lib['build_dir'] not in libraries:
399+
libraries.append(lib['id'])
400400

401401

402402
build_project_options = ["analyze"] if self.opts_goanna_for_tests else None

0 commit comments

Comments
 (0)