Skip to content

makefiles/murdock.inc.mk: do not overwrite FLASHFILE if set#11097

Merged
kaspar030 merged 1 commit intoRIOT-OS:masterfrom
cladmi:pr/murdock/flashfile
Mar 4, 2019
Merged

makefiles/murdock.inc.mk: do not overwrite FLASHFILE if set#11097
kaspar030 merged 1 commit intoRIOT-OS:masterfrom
cladmi:pr/murdock/flashfile

Conversation

@cladmi
Copy link
Copy Markdown
Contributor

@cladmi cladmi commented Mar 4, 2019 •
edited
Loading

Contribution description

If FLASHFILE is set keep the original value.

It changes the variable from an immediate to a deferred variable but if
murdocks keeps working there is no issue.

I forgot to also put this change when I did #11084 otherwise FLASHFILE is not usable.

Testing procedure

Murdock keeps running tests on samr21-xpro, and also runs the tests/riotboot test on samr21-xpro.

This allows setting FLASHFILE in the build system without having the value overwritten.
Testing can be done through #11089 that uses this pull request.

Also, locally you can verify the value of FLASHFILE is the same for samr21-xpro:

BOARD=samr21-xpro make --no-print-directory -C examples/default/ info-debug-variable-FLASHFILE
/home/harter/work/git/RIOT/examples/default/bin/samr21-xpro/default.bin
BOARD=samr21-xpro make --no-print-directory -C tests/riotboot info-debug-variable-FLASHFILE
/home/harter/work/git/RIOT/tests/riotboot/bin/samr21-xpro/tests_riotboot-slot0-combined.bin

Issues/PRs references

Part of #8838
Needed by #11089

@cladmi
makefiles/murdock.inc.mk: do not overwrite FLASHFILE if set
7467d1b 
If FLASHFILE is set keep the original value.

It changes the variable from an immediate to a deferred variable but if
murdocks keeps working there is no issue.
@cladmi cladmi added Area: build system Area: Build system CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR CI: run tests If set, CI server will run tests on hardware for the labeled PR labels Mar 4, 2019
@cladmi cladmi added this to the Release 2019.04 milestone Mar 4, 2019
This was referenced Mar 4, 2019
Merged
Merged
kaspar030
kaspar030 approved these changes Mar 4, 2019
View reviewed changes
Copy link
Copy Markdown
Contributor

@kaspar030 kaspar030 left a comment

Choose a reason for hiding this comment

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

ACK.

@cladmi
Copy link
Copy Markdown
Contributor Author

cladmi commented Mar 4, 2019

Murdock is indeed still using the file https://ci.riot-os.org/RIOT-OS/RIOT/11097/7467d1be7593ffad541d4aea588eedb75fa9f1f7/output/run_test/tests/riotboot/samr21-xpro:gnu.txt for riotboot and also for a normal test (randomly chosen) https://ci.riot-os.org/RIOT-OS/RIOT/11097/7467d1be7593ffad541d4aea588eedb75fa9f1f7/output/run_test/tests/pipe/samr21-xpro:llvm.txt

@kaspar030 kaspar030 merged commit 1bed568 into RIOT-OS:master Mar 4, 2019
@cladmi cladmi deleted the pr/murdock/flashfile branch March 5, 2019 10:15
@cladmi
Copy link
Copy Markdown
Contributor Author

cladmi commented Mar 5, 2019

Thank you for the review.

@danpetry danpetry modified the milestone: Release 2019.04 Mar 11, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@kaspar030 kaspar030 kaspar030 approved these changes

Assignees

No one assigned

Labels

Area: build system Area: Build system CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR CI: run tests If set, CI server will run tests on hardware for the labeled PR

Projects

None yet

Milestone

Release 2019.04

Development

Successfully merging this pull request may close these issues.

3 participants

@cladmi @kaspar030 @danpetry