Skip to content

Add include search path when preprocessing assembly files for uvision and make_armc5 exports #6356

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 2 commits into from
Mar 19, 2018
Merged

Add include search path when preprocessing assembly files for uvision and make_armc5 exports #6356

merged 2 commits into from
Mar 19, 2018

Conversation

hug-dev
Copy link
Contributor

@hug-dev hug-dev commented Mar 14, 2018

Without that fix, the generated uvision and make_armc5 exports would not include the different project folders in the search path of the assembly command line. It forces the user of using #include with relative path.
These issues were discovered while doing the export test if the pull request #6168

hug-dev added 2 commits March 14, 2018 13:08
@hug-dev
Add ASM flags virtual path for make export
6b72ede 
When exporting a mbed project to make_armc5, the include options (-I)
of the ASM flags are not pointing to the good folder. It should be
pointing to the root mbed-os folder and not the one in BUILD.
This issue was found in the pull request ARMmbed#6168.

Signed-off-by: Hugues de Valon <[email protected]>
@hug-dev
Add ASM include flags in uvision export
ebc9289 
When exporting to a uvision project, the include flags are not put in
the assembly compilation line. When assembling the files containing
includes, the search path will then fail. This patch adds the include
paths to the Assembly sequence, as it is done for compilation.
This issue was found in the pull request ARMmbed#6168.

Signed-off-by: Hugues de Valon <[email protected]>
@hug-dev hug-dev mentioned this pull request Mar 14, 2018
Merged
theotherjimmy
theotherjimmy approved these changes Mar 14, 2018
View reviewed changes
Copy link
Contributor

@theotherjimmy theotherjimmy left a comment

Choose a reason for hiding this comment

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

Looks great. Thanks!

@cmonr
Copy link
Contributor

cmonr commented Mar 15, 2018

/morph build

@mbed-ci
Copy link

mbed-ci commented Mar 15, 2018

Build : FAILURE

Build number : 1448
Build artifacts/logs : http://mbed-os.s3-website-eu-west-1.amazonaws.com/?prefix=builds/6356/

@0xc0170
Copy link
Contributor

0xc0170 commented Mar 15, 2018

There was a license server failure, we are investigating and restart CI

@cmonr
Copy link
Contributor

cmonr commented Mar 15, 2018

/morph build

@mbed-ci
Copy link

mbed-ci commented Mar 15, 2018

Build : SUCCESS

Build number : 1460
Build artifacts/logs : http://mbed-os.s3-website-eu-west-1.amazonaws.com/?prefix=builds/6356/

Triggering tests

/morph test
/morph uvisor-test
/morph export-build
/morph mbed2-build

@mbed-ci
Copy link

mbed-ci commented Mar 16, 2018

Exporter Build : SUCCESS

Build number : 1101
Build artifacts/logs : http://mbed-os.s3-website-eu-west-1.amazonaws.com/?prefix=builds/exporter/6356/

@mbed-ci
Copy link

mbed-ci commented Mar 16, 2018

Test : FAILURE

Build number : 1228
Test logs :http://mbed-os-logs.s3-website-us-west-1.amazonaws.com/?prefix=logs/6356/1228

@cmonr
Copy link
Contributor

cmonr commented Mar 16, 2018

CI issue: Machine timeout?

@0xc0170 Might need to restart this test.

@cmonr
Copy link
Contributor

cmonr commented Mar 16, 2018

/morph test

@mbed-ci
Copy link

mbed-ci commented Mar 17, 2018

Test : FAILURE

Build number : 1244
Test logs :http://mbed-os-logs.s3-website-us-west-1.amazonaws.com/?prefix=logs/6356/1244

@hug-dev
Copy link
Contributor Author

hug-dev commented Mar 19, 2018

The tests-mbed_hal-flash on NRF52_DK, compiled with GCC_ARM does not pass.
It seems to be a timing problem:

[1521259628.14][CONN][RXD] >>> Running case #6: 'Flash - clock and cache test'...
[1521259628.14][CONN][INF] found KV pair in stream: {{__testcase_start;Flash - clock and cache test}}, queued...
[1521259628.80][CONN][RXD] :273::FAIL: Values Not Within Delta 2939 Expected 587860 Was 593018
[1521259628.89][CONN][INF] found KV pair in stream: {{__testcase_finish;Flash - clock and cache test;0;1}}, queued...
[1521259628.98][CONN][RXD] >>> 'Flash - clock and cache test': 0 passed, 1 failed with reason 'Assertion Failed'

Is that related with the CI issue?

@hug-dev
Copy link
Contributor Author

hug-dev commented Mar 19, 2018

oops just seens #6340 nevermind 😨

@0xc0170
Copy link
Contributor

0xc0170 commented Mar 19, 2018

/morph test

@mbed-ci
Copy link

mbed-ci commented Mar 19, 2018

Test : SUCCESS

Build number : 1260
Test logs :http://mbed-os-logs.s3-website-us-west-1.amazonaws.com/?prefix=logs/6356/1260

@cmonr cmonr merged commit f6bcbfe into ARMmbed:master Mar 19, 2018
@ccli8 ccli8 mentioned this pull request Mar 20, 2018
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@theotherjimmy theotherjimmy theotherjimmy approved these changes

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

Successfully merging this pull request may close these issues.
5 participants
@hug-dev @cmonr @mbed-ci @0xc0170 @theotherjimmy