Skip to content

Ensure macros and parameters with the same name are not repeated. #8982

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 3 commits into from
Dec 7, 2018
Merged

Ensure macros and parameters with the same name are not repeated. #8982

merged 3 commits into from
Dec 7, 2018

Conversation

bridadan
Copy link
Contributor

@bridadan bridadan commented Dec 5, 2018 •
edited
Loading

Description

Should fix #8931.

This covers the case when a macro is set with the same name as a
parameter. Previously, the macro would be repeated on the command line,
which causes certain toolchains to break (ex. IAR assembler). Now the
config system will override the parameter's value with the macro's
value.

Pull request type

[x] Fix
[ ] Refactor
[ ] Target update
[ ] Functionality change
[ ] Docs update
[ ] Test update
[ ] Breaking change

@bridadan bridadan mentioned this pull request Dec 5, 2018
Closed
cmonr
cmonr reviewed Dec 6, 2018
View reviewed changes
@bridadan
Copy link
Contributor Author

bridadan commented Dec 6, 2018

Comments added!

cmonr
cmonr approved these changes Dec 6, 2018
View reviewed changes
Copy link
Contributor

@cmonr cmonr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

@theotherjimmy
Copy link
Contributor

theotherjimmy commented Dec 6, 2018 •
edited
Loading

@bridadan Is there a way we could test for this? that way we can prevent regressions.

@bridadan
Ensure macros and parameters with the same name are not repeated.
5957ffd 
This covers the case when a macro is set with the same name as a
parameter. Previously, the macro would be repeated on the command line,
which causes certain toolchains to break (ex. IAR assembler). Now the
config system will override the parameter's value with the macro's
value.
@bridadan bridadan force-pushed the fix_duplicate_macros branch from 0c904f4 to 990ce38 Compare December 6, 2018 16:32
@bridadan bridadan force-pushed the fix_duplicate_macros branch from 990ce38 to b8cdfc5 Compare December 6, 2018 16:37
@bridadan
Copy link
Contributor Author

bridadan commented Dec 6, 2018

Added a unit test.

Also, turns out the ConfigMacro class already does that kind of parsing of the = sign, so I just reuse that computed value (the parsing happens here: https://github.com/ARMmbed/mbed-os/blob/master/tools/config/__init__.py#L278-L287)

theotherjimmy
theotherjimmy suggested changes Dec 6, 2018
View reviewed changes
@cmonr
Copy link
Contributor

cmonr commented Dec 6, 2018

CI started

@mbed-ci
Copy link

mbed-ci commented Dec 7, 2018

Test run: SUCCESS

Summary: 11 of 11 test jobs passed
Build number : 1
Build artifacts

@cmonr cmonr merged commit 243b9df into ARMmbed:master Dec 7, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cmonr cmonr cmonr approved these changes

@theotherjimmy theotherjimmy theotherjimmy approved these changes

Assignees
No one assigned
Labels
release-version: 5.11.0-rc3
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

IAR support broken with Pelion DM Client during ASM
4 participants
@bridadan @theotherjimmy @cmonr @mbed-ci