Skip to content
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

Move rtos stubs to the rtos directory #14819

Merged
merged 4 commits into from
Jun 30, 2021
Merged

Move rtos stubs to the rtos directory #14819

merged 4 commits into from
Jun 30, 2021

Conversation

rajkan01
Copy link
Contributor

@rajkan01 rajkan01 commented Jun 23, 2021

Summary of changes

fixes #14793
This PR makes the mbed-stubs-rtos library more self-contained by removing the dependencies on the monolithic header libraries we created to make implementing the stubs easier. We also move the files to the rtos directory so the stubs live with the associated component.

Impact of changes

None.

Migration actions required

None

Documentation

To be updated


Pull request type

[x] Patch update (Bug fix / Target update / Docs update / Test update / Refactor)
[] Feature update (New feature / Functionality change / New API)
[] Major update (Breaking change E.g. Return code change / API behaviour change)

Test results

[] No Tests required for this change (E.g docs only update)
[x] Covered by existing mbed-os tests (Greentea or Unittest)
[] Tests / results supplied as part of this PR

Reviewers


@rajkan01 rajkan01 changed the title Move mbed-stubs-rtos to the rtos directory Move rtos stubs to the rtos directory Jun 23, 2021
@ciarmcom ciarmcom added the release-type: patch Indentifies a PR as containing just a patch label Jun 23, 2021
@ciarmcom ciarmcom requested a review from a team June 23, 2021 12:30
@ciarmcom
Copy link
Member

@rajkan01, thank you for your changes.
@ARMmbed/mbed-os-maintainers please review.

@LDong-Arm
Copy link
Contributor

I added the issue to our project board and removed the PR. We prefer putting the issue onto the board, and it automatically shows the PR that fixes it.

LDong-Arm
LDong-Arm previously approved these changes Jun 23, 2021
@mergify mergify bot added needs: CI and removed needs: review labels Jun 23, 2021
0xc0170
0xc0170 previously approved these changes Jun 24, 2021
@ciarmcom
Copy link
Member

This pull request has automatically been marked as stale because it has had no recent activity. @ARMmbed/mbed-os-maintainers, please start CI to get the PR merged.

@ciarmcom ciarmcom added the stale Stale Pull Request label Jun 24, 2021
@0xc0170
Copy link
Contributor

0xc0170 commented Jun 25, 2021

CI started

@0xc0170 0xc0170 removed the stale Stale Pull Request label Jun 25, 2021
@mergify mergify bot added needs: work and removed needs: CI labels Jun 25, 2021
@mbed-ci
Copy link

mbed-ci commented Jun 25, 2021

Jenkins CI Test : ❌ FAILED

Build Number: 1 | 🔒 Jenkins CI Job | 🌐 Logs & Artifacts

CLICK for Detailed Summary

jobs Status
jenkins-ci/mbed-os-ci_unittests ✔️
jenkins-ci/mbed-os-ci_cmake-cloud-example-ARM ✔️
jenkins-ci/mbed-os-ci_build-cloud-example-ARM
jenkins-ci/mbed-os-ci_cmake-cloud-example-GCC_ARM ✔️
jenkins-ci/mbed-os-ci_build-cloud-example-GCC_ARM
jenkins-ci/mbed-os-ci_cmake-example-GCC_ARM ✔️
jenkins-ci/mbed-os-ci_cmake-example-ARM ✔️
jenkins-ci/mbed-os-ci_build-greentea-GCC_ARM
jenkins-ci/mbed-os-ci_build-greentea-ARM
jenkins-ci/mbed-os-ci_build-example-GCC_ARM
jenkins-ci/mbed-os-ci_build-example-ARM

@0xc0170
Copy link
Contributor

0xc0170 commented Jun 25, 2021

The failed files are stubs from unittests, they should not be compiled for cloud examples (I opened build cloud example Gcc Arm for instance) ?

@mergify mergify bot dismissed stale reviews from LDong-Arm and 0xc0170 June 25, 2021 13:36

Pull request has been modified.

@rajkan01
Copy link
Contributor Author

The failed files are stubs from unittests, they should not be compiled for cloud examples (I opened build cloud example Gcc Arm for instance) ?

It supposed not to be compiled for cloud example because of newly added the UNITTESTS directory in rtos, so pushed the missing .mbedignore file to fix the issue

@0xc0170
Copy link
Contributor

0xc0170 commented Jun 25, 2021

CI restarted

@mbed-ci
Copy link

mbed-ci commented Jun 25, 2021

Jenkins CI Test : ✔️ SUCCESS

Build Number: 2 | 🔒 Jenkins CI Job | 🌐 Logs & Artifacts

CLICK for Detailed Summary

jobs Status
jenkins-ci/mbed-os-ci_unittests ✔️
jenkins-ci/mbed-os-ci_build-cloud-example-ARM ✔️
jenkins-ci/mbed-os-ci_cmake-cloud-example-ARM ✔️
jenkins-ci/mbed-os-ci_build-cloud-example-GCC_ARM ✔️
jenkins-ci/mbed-os-ci_cmake-cloud-example-GCC_ARM ✔️
jenkins-ci/mbed-os-ci_build-greentea-ARM ✔️
jenkins-ci/mbed-os-ci_build-greentea-GCC_ARM ✔️
jenkins-ci/mbed-os-ci_cmake-example-ARM ✔️
jenkins-ci/mbed-os-ci_build-example-ARM ✔️
jenkins-ci/mbed-os-ci_cmake-example-GCC_ARM ✔️
jenkins-ci/mbed-os-ci_build-example-GCC_ARM ✔️
jenkins-ci/mbed-os-ci_greentea-test ✔️

LDong-Arm
LDong-Arm previously approved these changes Jun 28, 2021
Copy link
Contributor

@LDong-Arm LDong-Arm left a comment

Choose a reason for hiding this comment

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

The last commit "Fix the CI issue" is a fix-up and should ideally be squashed to the original commit (that moves files). But as CI has already been run, I'm fine with the PR in its current state.

@0xc0170
Copy link
Contributor

0xc0170 commented Jun 28, 2021

@rajkan01 We can rerun the CI if you squash the last two (fixup commit)

Move the rtos stub library into the rtos component directory.
so we can avoid duplicating the mbed-os source tree in a central
UNITTESTS folder.
…ctory

Move rtos stubs headers to the mbed-os/rtos/tests/UNITTESTS/double
directory and update CMake to create a mbed-stubs-rtos-headers
library for rtos stub headers
Move the header-only mbed-headers-rtos library the unit test stubs
depend on into the rtos component directory. This makes the rtos
stubs more self-contained and improves the composition of the library.
mbed-stubs-connectivity now depends on the mbed-stubs-rtos and
mbed-stubs-rtos-headers because it requires some headers and sources
which were moved to mbed-stubs-rtos and mbed-stubs-rtos-headers.
@mergify mergify bot dismissed LDong-Arm’s stale review June 28, 2021 13:32

Pull request has been modified.

@0xc0170
Copy link
Contributor

0xc0170 commented Jun 29, 2021

Ci restarted

@mbed-ci
Copy link

mbed-ci commented Jun 29, 2021

Jenkins CI Test : ✔️ SUCCESS

Build Number: 3 | 🔒 Jenkins CI Job | 🌐 Logs & Artifacts

CLICK for Detailed Summary

jobs Status
jenkins-ci/mbed-os-ci_unittests ✔️
jenkins-ci/mbed-os-ci_build-cloud-example-GCC_ARM ✔️
jenkins-ci/mbed-os-ci_build-cloud-example-ARM ✔️
jenkins-ci/mbed-os-ci_cmake-cloud-example-ARM ✔️
jenkins-ci/mbed-os-ci_cmake-cloud-example-GCC_ARM ✔️
jenkins-ci/mbed-os-ci_build-greentea-ARM ✔️
jenkins-ci/mbed-os-ci_cmake-example-ARM ✔️
jenkins-ci/mbed-os-ci_build-greentea-GCC_ARM ✔️
jenkins-ci/mbed-os-ci_cmake-example-GCC_ARM ✔️
jenkins-ci/mbed-os-ci_build-example-ARM ✔️
jenkins-ci/mbed-os-ci_build-example-GCC_ARM ✔️
jenkins-ci/mbed-os-ci_greentea-test ✔️

@rajkan01 rajkan01 requested a review from LDong-Arm June 29, 2021 09:37
@0xc0170 0xc0170 merged commit 8902a0c into master Jun 30, 2021
@0xc0170 0xc0170 deleted the move_rtos_stubs branch June 30, 2021 09:49
@mergify mergify bot removed the ready for merge label Jun 30, 2021
@mbedmain mbedmain added release-version: 6.13.0 Release-pending and removed release-type: patch Indentifies a PR as containing just a patch Release-pending labels Jul 14, 2021
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.

Move the rtos stubs to rtos/tests/UNITTESTS
6 participants