Skip to content

Bring back the missing watchdog commits #10777

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.

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

Merged

Conversation

fkjagodzinski
Copy link
Member

@fkjagodzinski fkjagodzinski commented Jun 6, 2019

Description

Bring back commits that were (incorrectly) dropped during one of feature-watchdog rebases.
Fixes #10559.

Original patch descriptions in #6709 and #7021.

NOTE: Marking this as a draft -- let's wait until #10645 is merged.

Pull request type

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

Reviewers

@0xc0170 @jamesbeyond

Release Notes

@ciarmcom ciarmcom requested review from 0xc0170, jamesbeyond and a team June 6, 2019 15:00
@ciarmcom
Copy link
Member

ciarmcom commented Jun 6, 2019

@fkjagodzinski, thank you for your changes.
@jamesbeyond @0xc0170 @ARMmbed/mbed-os-maintainers please review.

@fkjagodzinski fkjagodzinski force-pushed the fix-watchdog-missing_commits branch 2 times, most recently from d918078 to b95ceec Compare June 14, 2019 08:41
@fkjagodzinski fkjagodzinski marked this pull request as ready for review June 14, 2019 08:43
Added a mechanism which will prevent an initialised watchdog from
resetting the device during final greentea communication.
This allows testing watchdog timeouts as short as 50 ms.
Skip test cases with unsupported timeout values.
@fkjagodzinski fkjagodzinski force-pushed the fix-watchdog-missing_commits branch from b95ceec to c5ad70c Compare June 14, 2019 08:59
@fkjagodzinski
Copy link
Member Author

fkjagodzinski commented Jun 14, 2019

astyle shouldn't complain anymore. Style corrected.

@fkjagodzinski
Copy link
Member Author

@ARMmbed/mbed-os-maintainers this PR is ready for the CI.

Copy link
Contributor

@jamesbeyond jamesbeyond left a comment

Choose a reason for hiding this comment

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

LGTM

@adbridge
Copy link
Contributor

CI started

@mbed-ci
Copy link

mbed-ci commented Jun 15, 2019

Test run: SUCCESS

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

@fkjagodzinski
Copy link
Member Author

@ARMmbed/mbed-os-maintainers, #10839 is waiting for this PR to be merged.

@jamesbeyond
Copy link
Contributor

Hi @ARMmbed/mbed-os-maintainers, CI are successful, possible to merge this to feature branch ? 😃

@adbridge adbridge merged commit b3d45c5 into ARMmbed:feature-watchdog Jun 18, 2019
@fkjagodzinski fkjagodzinski deleted the fix-watchdog-missing_commits branch July 9, 2019 08:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants