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 hal stubs to hal directory #14827

Merged
merged 4 commits into from
Jul 1, 2021
Merged

Move hal stubs to hal directory #14827

merged 4 commits into from
Jul 1, 2021

Conversation

rajkan01
Copy link
Contributor

Summary of changes

fixes #14789

  • This PR makes the mbed-stubs-hal 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 hal directory so the stubs live with the associated component.
  • move mbed-headers-hal library creation inside doubles CMake.

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


@ciarmcom ciarmcom added the release-type: patch Indentifies a PR as containing just a patch label Jun 24, 2021
@ciarmcom ciarmcom requested a review from a team June 24, 2021 11:30
@ciarmcom
Copy link
Member

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

@mergify
Copy link

mergify bot commented Jun 24, 2021

This PR cannot be merged due to conflicts. Please rebase to resolve them.

@rajkan01 rajkan01 force-pushed the move_hal_stubs branch 2 times, most recently from 7f6f4b4 to 65e9b8c Compare June 25, 2021 09:45
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.

LGTM

@mergify mergify bot added needs: CI and removed needs: work labels Jun 29, 2021
@LDong-Arm
Copy link
Contributor

Given the number of PRs that move unit tests stubs, maybe we will need to rebase some of them a few times when things get merged and cause git conflicts.

hal/tests/UNITTESTS/doubles/CMakeLists.txt Outdated Show resolved Hide resolved
@mergify mergify bot added needs: work and removed needs: CI labels Jun 29, 2021
@mergify
Copy link

mergify bot commented Jun 30, 2021

This PR cannot be merged due to conflicts. Please rebase to resolve them.

@mergify mergify bot dismissed LDong-Arm’s stale review July 1, 2021 08:47

Pull request has been modified.

@0xc0170
Copy link
Contributor

0xc0170 commented Jul 1, 2021

CI started

@mbed-ci
Copy link

mbed-ci commented Jul 1, 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_build-cloud-example-GCC_ARM
jenkins-ci/mbed-os-ci_cmake-cloud-example-GCC_ARM ✔️
jenkins-ci/mbed-os-ci_cmake-example-ARM ✔️
jenkins-ci/mbed-os-ci_cmake-example-GCC_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-ARM
jenkins-ci/mbed-os-ci_build-example-GCC_ARM

Move the hal stubs into the hal component directory.
so we can avoid duplicating the mbed-os source tree in a central
UNITTESTS folder.
Move the header-only mbed-headers-hal library the unit test stubs
depend on into the hal component directory. This makes the events
stubs more self-contained and improves the composition of the library.
Previously the hal stub library depended on `mbed-headers`, which
is a collection of all available headers in mbed-os. To make it easier
to separate the library, only depend on the headers we're using.
The --coverage flag globally set in UNITTESTS/CMakeLists.txt
and configuring the same option again in mbed-stubs-hal is
redundant so remove it
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.

LGTM, just need to rerun CI

@mergify mergify bot added needs: CI and removed needs: work labels Jul 1, 2021
@0xc0170
Copy link
Contributor

0xc0170 commented Jul 1, 2021

CI started

@mbed-ci
Copy link

mbed-ci commented Jul 1, 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_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_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 ✔️

@0xc0170 0xc0170 merged commit d0c4468 into master Jul 1, 2021
@mergify mergify bot removed the ready for merge label Jul 1, 2021
@0xc0170 0xc0170 deleted the move_hal_stubs branch July 1, 2021 14:29
@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 hal stubs to hal/tests/UNITTESTS
6 participants