Skip to content

tests: replace SLEEP define#12412

Merged
benpicco merged 1 commit intoRIOT-OS:masterfrom
benpicco:tests_no-SLEEP
Oct 15, 2019
Merged

tests: replace SLEEP define#12412
benpicco merged 1 commit intoRIOT-OS:masterfrom
benpicco:tests_no-SLEEP

Conversation

@benpicco
Copy link
Contributor

@benpicco benpicco commented Oct 9, 2019 •
edited
Loading

Contribution description

The SLEEP define collides with an Atmega header file, so all those tests will fail to build for #12411
This renames the defines to resolve the conflict.

Testing procedure

No semantic changes, so compile test should be enough.

Issues/PRs references

fixes build failures for #12411

@benpicco benpicco added Area: tests Area: tests and testing framework Type: cleanup The issue proposes a clean-up / The PR cleans-up parts of the codebase / documentation CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR labels Oct 9, 2019
aabadie
aabadie reviewed Oct 10, 2019
View reviewed changes
@maribu maribu removed the CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR label Oct 10, 2019
@maribu
Copy link
Member

maribu commented Oct 10, 2019

I think you can squash right away. No need to let murdock run twice :-)

@benpicco
tests: replace SLEEP define
4174585 
The SLEEP define collides with an Arduino header file.
Rename the define to resolve the conflict.
@benpicco benpicco added CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR Impact: minor The PR is small in size and might only require a quick look of a knowledgeable reviewer labels Oct 10, 2019
@benpicco benpicco requested a review from maribu October 15, 2019 12:38
@benpicco benpicco mentioned this pull request Oct 15, 2019
Merged
@maribu maribu added Reviewed: 1-fundamentals The fundamentals of the PR were reviewed according to the maintainer guidelines Reviewed: 2-code-design The code design of the PR was reviewed according to the maintainer guidelines Reviewed: 4-code-style The adherence to coding conventions by the PR were reviewed according to the maintainer guidelines Reviewed: 5-documentation The documentation details of the PR were reviewed according to the maintainer guidelines 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 Oct 15, 2019
@maribu
Copy link
Member

maribu commented Oct 15, 2019

I think if Murdock still passes on top of current master, this can go in untested. There is nothing scary in the change and I feel very confident that any issue this could cause would be revealed at compile time.

maribu
maribu approved these changes Oct 15, 2019
View reviewed changes
Copy link
Member

@maribu maribu left a comment

Choose a reason for hiding this comment

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

ACK

@benpicco benpicco merged commit 1ffca2b into RIOT-OS:master Oct 15, 2019
@benpicco benpicco deleted the tests_no-SLEEP branch October 15, 2019 13:39
@fjmolinas fjmolinas added this to the Release 2020.01 milestone Dec 13, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@aabadie aabadie aabadie left review comments

@maribu maribu maribu approved these changes

Assignees

No one assigned

Labels

Area: tests Area: tests and testing framework CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR Impact: minor The PR is small in size and might only require a quick look of a knowledgeable reviewer Reviewed: 1-fundamentals The fundamentals of the PR were reviewed according to the maintainer guidelines Reviewed: 2-code-design The code design of the PR was reviewed according to the maintainer guidelines Reviewed: 4-code-style The adherence to coding conventions by the PR were reviewed according to the maintainer guidelines Reviewed: 5-documentation The documentation details of the PR were reviewed according to the maintainer guidelines Type: cleanup The issue proposes a clean-up / The PR cleans-up parts of the codebase / documentation

Projects

None yet

Milestone

Release 2020.01

Development

Successfully merging this pull request may close these issues.

4 participants

@benpicco @maribu @aabadie @fjmolinas