Put quotes around include files

[moonchen]

This fixes a problem when the path to include files have spaces.
See ARMmbed/mbed-os-example-uvisor#31 for an
example of this problem.

Signed-off-by: Mo Chen [email protected]

[theotherjimmy]

@moonchen Have you confirmed that this input is accepted by all three toolchains?

[0xc0170]

@moonchen bump

[0xc0170]

Let's run CI on this to confirm that this would not fail for any toolchain, as this should be exercised there.

[bridadan]

/morph test

[mbed-bot]

Result: FAILURE

Your command has finished executing! Here's what you wrote!

/morph test

Output

mbed Build Number: 548

Build failed!

[0xc0170]

@moonchen IAR failed for all targets, looks like this is not supported there.

Locally, it fails for any assembly file as:

Compile [100.0%]: cmain.S
Traceback (most recent call last):
  File "tools\build.py", line 211, in <module>
    build_profile=profile)
  File "mbed-os\tools\build_api.py", line 1014, in build_mbed_libs
    objects = toolchain.compile_sources(resources, tmp_path)
  File "mbed-os\tools\toolchains\__init__.py", line 830, in compile_sources
    return self.compile_seq(queue, objects)
  File "mbed-os\tools\toolchains\__init__.py", line 844, in compile_seq
    res['command']
  File "mbed-os\tools\toolchains\__init__.py", line 986, in compile_output
    raise ToolException(_stderr)
ToolException

[bridadan]

Instead of wrapping in quotes, what about escaping the spaces?

[theotherjimmy]

@bridadan @moonchen How about wrapping the whole argument in quotes?

[bridadan]

Worth a shot. @moonchen do you have access to the IAR compiler?

[theotherjimmy]

@moonchen I gave it a quick whirl.

diff --git i/tools/toolchains/__init__.py w/tools/toolchains/__init__.py
index c572fe96a..8aef56b22 100644
--- i/tools/toolchains/__init__.py
+++ w/tools/toolchains/__init__.py
@@ -740,7 +740,7 @@ class mbedToolchain:
                         c = c.replace("\\", "/")
                         if self.CHROOT:
                             c = c.replace(self.CHROOT, '')
-                        cmd_list.append('-I%s' % c)
+                        cmd_list.append('"-I%s"' % c)
                 string = " ".join(cmd_list)
                 f.write(string)
         return include_file

does not error in that way

[moonchen]

@theotherjimmy quoting the whole thing worked for me on gcc.

[theotherjimmy]

Then let's use that commit.

[theotherjimmy]

@moonchen @bridadan I already tested this with ARMCC and IAR.

[moonchen]

Amended to use the new patch.

[theotherjimmy]

@moonchen I already did that.

[theotherjimmy]

/morph test

[mbed-bot]

Result: FAILURE

Your command has finished executing! Here's what you wrote!

/morph test

Output

mbed Build Number: 644

Test failed!

[theotherjimmy]

/morph test

[mbed-bot]

Result: FAILURE

Your command has finished executing! Here's what you wrote!

/morph test

Output

mbed Build Number: 691

Test failed!

[theotherjimmy]

These timer tests need to be way less flaky.

/morph test

[mbed-bot]

Result: SUCCESS

Your command has finished executing! Here's what you wrote!

/morph test

Output

mbed Build Number: 703

All builds and test passed!

[0xc0170]

retest uvisor

[jeromecoutant]

Hi
Since this patch, I couldn't execute IAR tests...

[jeromecoutant]

$ python tools/build.py -m NUCLEO_F411RE -t IAR -vv
Building library CMSIS (NUCLEO_F411RE, IAR)
Scan: cmsis
[DEBUG] Macros: -D__MBED__=1 -DDEVICE_I2CSLAVE=1 -D__FPU_PRESENT=1 -DDEVICE_PORTOUT=1 -DUSBHOST_OTHER -DDEVICE_PORTINOUT=1 -DTARGET_RTOS_M4_M7 -DDEVICE_LOWPOWERTIMER=1 -DDEVICE_RTC=1 -DTOOLCHAIN_object -DDEVICE_SERIAL_ASYNCH=1 -DTARGET_STM32F4 -D__CMSIS_RTOS -D__CORTEX_M4 -DDEVICE_I2C_ASYNCH=1 -DTARGET_CORTEX_M -DTARGET_LIKE_CORTEX_M4 -DTARGET_M4 -DTARGET_UVISOR_UNSUPPORTED -DDEVICE_SPI_ASYNCH=1 -DTARGET_STM32F411xE -DTOOLCHAIN_IAR -DDEVICE_INTERRUPTIN=1 -DMBED_BUILD_TIMESTAMP=1499852438.58 -DDEVICE_I2C=1 -DTRANSACTION_QUEUE_SIZE_SPI=2 -DTARGET_NUCLEO_F411RE -DDEVICE_STDIO_MESSAGES=1 -DDEVICE_SERIAL=1 -DTARGET_FF_MORPHO -DTARGET_FAMILY_STM32 -DTARGET_FF_ARDUINO -DDEVICE_PORTIN=1 -DTARGET_RELEASE -DTARGET_STM -DDEVICE_SERIAL_FC=1 -DTARGET_LIKE_MBED -D__MBED_CMSIS_RTOS_CM -DDEVICE_SLEEP=1 -DDEVICE_SPI=1 -DUSB_STM_HAL -DDEVICE_ERROR_RED=1 -DDEVICE_SPISLAVE=1 -DDEVICE_ANALOGIN=1 -DDEVICE_PWMOUT=1 -DTARGET_STM32F411RE -DARM_MATH_CM4
Compile [100.0%]: cmain.S
[DEBUG] Compile: C:\Program Files (x86)\IAR Systems\Embedded Workbench 7.5\arm\bin\iasmarm --cpu Cortex-M4F -DTRANSACTION_QUEUE_SIZE_SPI=2 -D__CORTEX_M4 -DUSB_STM_HAL -DARM_MATH_CM4 -D__FPU_PRESENT=1 -DUSBHOST_OTHER -D__MBED_CMSIS_RTOS_CM -D__CMSIS_RTOS -f C:\github\mbed\BUILD\mbed.temp\TARGET_NUCLEO_F411RE\TOOLCHAIN_IAR.includes_4cfbfefad6235a1de6e720e267b71586.txt -o C:\github\mbed\BUILD\mbed.temp\TARGET_NUCLEO_F411RE\TOOLCHAIN_IAR\TOOLCHAIN_IAR\cmain.o C:\github\mbed\cmsis\TOOLCHAIN_IAR\cmain.S
[DEBUG] Return: 3
Traceback (most recent call last):
File "tools/build.py", line 212, in
build_profile=profile)
File "C:\github\mbed\tools\build_api.py", line 1014, in build_mbed_libs
objects = toolchain.compile_sources(resources, tmp_path)
File "C:\github\mbed\tools\toolchains_init_.py", line 908, in compile_sources
return self.compile_seq(queue, objects)
File "C:\github\mbed\tools\toolchains_init_.py", line 922, in compile_seq
res['command']
File "C:\github\mbed\tools\toolchains_init_.py", line 1064, in compile_output
raise ToolException(_stderr)
ToolException

[0xc0170]

@jeromecoutant Thanks for reporting, I'll check what is going on, I am able to reproduce it, and will cehck what CI did for this PR.

It is not this PR, If you revert it, you get the same ToolExpection, investigating

[jeromecoutant]

When I revert it, it works for me

[0xc0170]

When I revert it, it works for me

I sent a fix, please review it #4749