Skip to content

murdock: nordic_softdevice_ble: softdevice.hex is a test input#11995

Merged
MrKevinWeiss merged 1 commit intoRIOT-OS:masterfrom
cladmi:pr/murdock/softdevice
Aug 12, 2019
Merged

murdock: nordic_softdevice_ble: softdevice.hex is a test input#11995
MrKevinWeiss merged 1 commit intoRIOT-OS:masterfrom
cladmi:pr/murdock/softdevice

Conversation

@cladmi
Copy link
Copy Markdown
Contributor

@cladmi cladmi commented Aug 12, 2019

Contribution description

When running tests using 'nordic_softdevice_ble', the 'softdevice.hex'
file must also be taken into account for the test hashing and be
uploaded to the separated murdock testing boards.

Testing procedure

Running test tests/nordic_softdevice with nrf52dk should now work on murdock.

Issues/PRs references

https://ci.riot-os.org/RIOT-OS/RIOT/master/700b121936dc4f39d66d84468fbd31398c9f1ec8/output/run_test/tests/nordic_softdevice/nrf52dk:gnu.txt

#11797 (comment)
#11697 (comment)

@MrKevinWeiss MrKevinWeiss added CI: run tests If set, CI server will run tests on hardware for the labeled PR CI: disable test cache If set, CI will always run all tests regardless of whether they have been run successfully before CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR Area: CI Area: Continuous Integration of RIOT components Type: bug The issue reports a bug / The PR fixes a bug (including spelling errors) labels Aug 12, 2019
@cladmi
Copy link
Copy Markdown
Contributor Author

cladmi commented Aug 12, 2019

Damn it is not working as the file as no explicit recipe.

@cladmi
Copy link
Copy Markdown
Contributor Author

cladmi commented Aug 12, 2019

I will try a hack to see if it at least works.

@cladmi cladmi force-pushed the pr/murdock/softdevice branch from 72a17fd to 0a957fb Compare August 12, 2019 09:55
@cladmi
Copy link
Copy Markdown
Contributor Author

cladmi commented Aug 12, 2019

I force-pushed to fix the ordering and have the test-input-hash fix before the other commit.

@cladmi
Copy link
Copy Markdown
Contributor Author

cladmi commented Aug 12, 2019

It did not work in parallel, so I moved the handling to the nordic_nordic_softdevice code handling.

I currently did it in the boards/common/nrf52 directory but could make more sense to have it globally in pkg/nordic_softdevice_ble.

@MrKevinWeiss MrKevinWeiss added CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR and removed CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR labels Aug 12, 2019
@cladmi
Copy link
Copy Markdown
Contributor Author

cladmi commented Aug 12, 2019

Now it is working :D

@MrKevinWeiss
Copy link
Copy Markdown
Contributor

Squash please!

@cladmi cladmi force-pushed the pr/murdock/softdevice branch from e27c637 to 4cd54f9 Compare August 12, 2019 12:35
When running tests using 'nordic_softdevice_ble', the 'softdevice.hex'
file must also be taken into account for the test hashing and be
uploaded to the separated murdock testing boards.

When listed as dependency from `test-input-hash` the file must have a
target, which he has not. The file is implicitly created when compiling
`ELFFILE` so declare it as order only dependency.
In practice `BASELIBS` could be enough or even `pkg-build-softdevice`
but I do not want to be depend that much on internals there.
@cladmi cladmi force-pushed the pr/murdock/softdevice branch from 4cd54f9 to e70efb7 Compare August 12, 2019 12:36
@cladmi
Copy link
Copy Markdown
Contributor Author

cladmi commented Aug 12, 2019

I squashed and also updated the commit message to take both commits into account.

@MrKevinWeiss
Copy link
Copy Markdown
Contributor

Your the best!

Copy link
Copy Markdown
Contributor

@MrKevinWeiss MrKevinWeiss left a comment

Choose a reason for hiding this comment

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

ACK!

@MrKevinWeiss MrKevinWeiss merged commit e5fe868 into RIOT-OS:master Aug 12, 2019
@cladmi
Copy link
Copy Markdown
Contributor Author

cladmi commented Aug 12, 2019

Thank you for the review!

@cladmi cladmi deleted the pr/murdock/softdevice branch August 12, 2019 13:54
@kb2ma kb2ma added this to the Release 2019.10 milestone Sep 16, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Area: CI Area: Continuous Integration of RIOT components CI: disable test cache If set, CI will always run all tests regardless of whether they have been run successfully before 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 Type: bug The issue reports a bug / The PR fixes a bug (including spelling errors)

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants