Preventing app_config from clobbering CLI macros

[bridadan]

Description

This fixes #3516. If an mbed_app.json file is used when compiling tests, the tools were incorrectly ignoring macros that were supplied on the command line. This PR fixes this so the macros propagate correctly.

Status

READY

Migrations

If this PR changes any APIs or behaviors, give a short description of what API users should do when this PR is merged.

NO

Todos

• Tests

Steps to test or reproduce

Edit any test with the following code:

#ifdef MY_SILLY_MACRO
printf("MY_SILLY_MACRO is set!\r\n");
#else
printf("MY_SILLY_MACRO is NOT set!\r\n");
#endif

If run the following commands, you should see MY_SILLY_MACRO is set! printed in the test report:

mbed test -DMY_SILLY_MACRO --compile --clean
mbed test --run -v

However, if you add an mbed_app.json file with the following contents:

{
    "macros": ["MY_DUMMY_MACRO"]
}

Then do a clean compile and run step again, you will see MY_SILLY_MACRO is NOT set! printed in the test report.

[0xc0170]

Thanks for fixing the issue !

[0xc0170]

/morph test

[mbed-bot]

Result: SUCCESS

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

/morph test

Output

mbed Build Number: 1350

All builds and test passed!

[jenia81]

@bridadan I've checked and it's working

[bridadan]

Great, thanks @jenia81!