Skip to content

Commit ce135e5

Browse files
committed
Fix all izip leftover instances and improve tests
1 parent db5bf16 commit ce135e5

File tree

2 files changed

+34
-17
lines changed

2 files changed

+34
-17
lines changed

.circleci/config.yml

Lines changed: 30 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -42,48 +42,65 @@ jobs:
4242
- run: cd .tests && mbed new supported-tests
4343
- run: |-
4444
cd .tests/supported-tests
45-
echo "Testing mbed-os-5.6.0"
46-
mbed update --clean "mbed-os-5.6.0"
45+
echo "Testing mbed-os-5.8.5"
46+
cd mbed-os
47+
mbed update --clean --clean-files "mbed-os-5.8.5"
4748
mbed compile -S
49+
mbed compile --config --prefix mbed
4850
mbed toolchain -S
4951
mbed target -S
5052
mbed export -S
53+
mbed test --compile-list
5154
- run: |-
5255
cd .tests/supported-tests
53-
echo "Testing mbed-os-5.5.0"
54-
mbed update --clean "mbed-os-5.5.0"
56+
echo "Testing mbed-os-5.7.6"
57+
cd mbed-os
58+
mbed update --clean --clean-files "mbed-os-5.7.5"
5559
mbed compile -S
5660
mbed toolchain -S
5761
mbed target -S
5862
mbed export -S
5963
- run: |-
6064
cd .tests/supported-tests
61-
echo "Testing mbed-os-5.4.0"
62-
mbed update --clean "mbed-os-5.4.0"
65+
echo "Testing mbed-os-5.6.6"
66+
cd mbed-os
67+
mbed update --clean --clean-files "mbed-os-5.6.5"
6368
mbed compile -S
6469
mbed toolchain -S
6570
mbed target -S
66-
mbed export -S
71+
mbed export -S
72+
- run: |-
73+
cd .tests/supported-tests
74+
echo "Testing mbed-os-5.5.6"
75+
cd mbed-os
76+
mbed update --clean --clean-files "mbed-os-5.5.5"
77+
mbed compile -S
78+
mbed toolchain -S
79+
mbed target -S
80+
mbed export -S
6781
- run: |-
6882
cd .tests/supported-tests
69-
echo "Testing mbed-os-5.3.0"
70-
mbed update --clean "mbed-os-5.3.0"
83+
echo "Testing mbed-os-5.4.6"
84+
cd mbed-os
85+
mbed update --clean --clean-files "mbed-os-5.4.5"
7186
mbed compile -S
7287
mbed toolchain -S
7388
mbed target -S
7489
mbed export -S
7590
- run: |-
7691
cd .tests/supported-tests
77-
echo "Testing mbed-os-5.2.0"
78-
mbed update --clean "mbed-os-5.2.0"
92+
echo "Testing mbed-os-5.2.3"
93+
cd mbed-os
94+
mbed update --clean --clean-files "mbed-os-5.2.3"
7995
mbed compile -S
8096
mbed toolchain -S
8197
mbed target -S
8298
mbed export -S
8399
- run: |-
84100
cd .tests/supported-tests
85-
echo "Testing mbed-os-5.1.0"
86-
mbed update --clean "mbed-os-5.1.0"
101+
echo "Testing mbed-os-5.1.5"
102+
cd mbed-os
103+
mbed update --clean --clean-files "mbed-os-5.1.5"
87104
mbed compile -S
88105
mbed toolchain -S
89106
mbed target -S

mbed/mbed.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2481,7 +2481,7 @@ def compile_(toolchain=None, target=None, profile=False, compile_library=False,
24812481
+ list(chain.from_iterable(zip(repeat('--profile'), profile or [])))
24822482
+ list(chain.from_iterable(zip(repeat('--source'), source)))
24832483
+ (['-v'] if verbose else [])
2484-
+ (list(chain.from_iterable(izip(repeat('--prefix'), config_prefix))) if config_prefix else []),
2484+
+ (list(chain.from_iterable(zip(repeat('--prefix'), config_prefix))) if config_prefix else []),
24852485
env=env)
24862486
else:
24872487
# If the user hasn't supplied a build directory, ignore the default build directory
@@ -2602,7 +2602,7 @@ def test_(toolchain=None, target=None, compile_list=False, run_list=False, compi
26022602

26032603
if compile_list:
26042604
popen([python_cmd, '-u', os.path.join(tools_dir, 'test.py'), '--list']
2605-
+ list(chain.from_iterable(list(izip(repeat('--profile'), profile or []))))
2605+
+ list(chain.from_iterable(list(zip(repeat('--profile'), profile or []))))
26062606
+ ['-t', tchain, '-m', target]
26072607
+ list(chain.from_iterable(zip(repeat('--source'), source)))
26082608
+ (['-n', tests_by_name] if tests_by_name else [])
@@ -2693,11 +2693,11 @@ def export(ide=None, target=None, source=False, clean=False, supported=False, ap
26932693
program.ignore_build_dir()
26942694

26952695
popen([python_cmd, '-u', os.path.join(tools_dir, 'project.py')]
2696-
+ list(chain.from_iterable(izip(repeat('-D'), macros)))
2696+
+ list(chain.from_iterable(zip(repeat('-D'), macros)))
26972697
+ ['-i', ide.lower()]
26982698
+ ['-m', target]
26992699
+ (['-c'] if clean else [])
2700-
+ list(chain.from_iterable(izip(repeat('--source'), source)))
2700+
+ list(chain.from_iterable(zip(repeat('--source'), source)))
27012701
+ (['--app-config', app_config] if app_config else [])
27022702
+ args,
27032703
env=env)

0 commit comments

Comments
 (0)