platformio/platformio-core
1
0
Fork 1
mirror of https://github.com/platformio/platformio-core.git synced 2025-07-31 10:37:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix issue with "build_unparse" for string items

Browse Source
This commit is contained in:
Ivan Kravets
2018-04-20 19:10:20 +03:00
parent ccb63a9ecc
commit 6b6860196a
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
platformio/builder/tools/platformio.py
View File

@ -176,8 +176,6 @@ def ProcessUnFlags(env, flags):
return return
for key, unflags in env.ParseFlagsExtended(flags).items(): for key, unflags in env.ParseFlagsExtended(flags).items():
for unflag in unflags: for unflag in unflags:
if not isinstance(unflag, (list, tuple)):
unflag = tuple([unflag])
for current in env.get(key, []): for current in env.get(key, []):
conditions = [ conditions = [
unflag == current, unflag == current,

5
tests/test_builder.py
View File

@ -63,7 +63,7 @@ def test_build_unflags(clirunner, validate_cliresult, tmpdir):
tmpdir.join("platformio.ini").write(""" tmpdir.join("platformio.ini").write("""
[env:native] [env:native]
platform = native platform = native
build_unflags = -DTMP_MACRO1=45 -I. -DNON_EXISTING_MACRO build_unflags = -DTMP_MACRO1=45 -I. -DNON_EXISTING_MACRO -lunknownLib -Os
extra_scripts = pre:extra.py extra_scripts = pre:extra.py
""") """)
@ -73,6 +73,8 @@ env.Append(CPPPATH="%s")
env.Append(CPPDEFINES="TMP_MACRO1") env.Append(CPPDEFINES="TMP_MACRO1")
env.Append(CPPDEFINES=["TMP_MACRO2"]) env.Append(CPPDEFINES=["TMP_MACRO2"])
env.Append(CPPDEFINES=("TMP_MACRO3", 13)) env.Append(CPPDEFINES=("TMP_MACRO3", 13))
env.Append(CCFLAGS=["-Os"])
env.Append(LIBS=["unknownLib"])
""" % str(tmpdir)) """ % str(tmpdir))
tmpdir.mkdir("src").join("main.c").write(""" tmpdir.mkdir("src").join("main.c").write("""
@ -90,4 +92,5 @@ int main() {
build_output = result.output[result.output.find( build_output = result.output[result.output.find(
"Scanning dependencies..."):] "Scanning dependencies..."):]
assert "-DTMP_MACRO1" not in build_output assert "-DTMP_MACRO1" not in build_output
assert "-Os" not in build_output
assert str(tmpdir) not in build_output assert str(tmpdir) not in build_output