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.

Sign up for GitHub

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

Jump to bottom

Move connectivity mbedtls stubs #14890

Merged
merged 4 commits into from
Jul 13, 2021
Merged

Move connectivity mbedtls stubs #14890

merged 4 commits into from
Jul 13, 2021

Conversation

rajkan01
Copy link
Contributor

@rajkan01 rajkan01 commented Jul 7, 2021

Summary of changes

fixes #14857

  • Moved the connectivity mbedtls into the connectivity/mbedtls component directory and added CMake for creating a new mbed-stubs-mbedtls stubs library, previously mbedtls stubs sources part of mbed-stubs-connectivity lib
  • Updated netsocket and lorawan unit tests that depend on mbedtls stubs with mbed-stubs-mbedtls a library
  • Previously all mbedtls headers made as a part of the mbed-headers-connectivity library. To make it easier to separate all the mbedtls headers into the separate mbed-headers-mbedtls library and keep them as part of mbedtls stub CMake. This makes the mbedtls stubs more self-contained and improves the composition of the library.
  • Updated netsocket and lorawan unit tests that depend on mbedtls headers to link with the newly added mbed-headers-mbedtls library
  • Previously all the stubs headers under mbed-stubs-headers, so this PR move all mbedtls stubs headers under mbedtls/tests/UNITTESTS/double directory and update CMake to include those headers as part of mbed-stubs-mbedtls

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 Jul 7, 2021
@ciarmcom
Copy link
Member

ciarmcom commented Jul 7, 2021

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

@ciarmcom ciarmcom requested a review from a team July 7, 2021 16:00
@rajkan01 rajkan01 force-pushed the move_connectivity_mbedtls_stubs branch from fb264e2 to 8c0c8bf Compare July 7, 2021 16:08
@rajkan01 rajkan01 mentioned this pull request Jul 8, 2021
Merged
@rajkan01 rajkan01 force-pushed the move_connectivity_mbedtls_stubs branch 2 times, most recently from dcaab91 to 9cc59a3 Compare July 9, 2021 09:53
LDong-Arm
LDong-Arm reviewed Jul 12, 2021
View reviewed changes
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, apart from coap-service stubs discussed in #14896 (comment)

@rajkan01 rajkan01 force-pushed the move_connectivity_mbedtls_stubs branch from 9cc59a3 to 412a7ad Compare July 12, 2021 12:14
@rajkan01 rajkan01 requested a review from LDong-Arm July 12, 2021 12:19
LDong-Arm
LDong-Arm reviewed Jul 12, 2021
View reviewed changes
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.

@rajkan01 Thanks, the change looks good to me now. It'd be good to update two of the commit messages (source and header) - they still say make a copy of the coap-service stub.

@rajkan01
CMake: Move mbedtls stubs to the mbedtls dir
66019cb 
Move the connectivity mbedtls stubs into the connectivity/mbedtls
component directory. So we can avoid duplicating the mbed-os source
tree in a central UNITTESTS folder.
@rajkan01
CMake: Update netsocket, lorawan unittest to use mbed-stubs-mbedtls
ef7699d 
Update netsocket and lorawan unit tests to link with a mbed-stubs-mbedtls
library that it depends on instead of link with mbed-stubs
which is a group of stubs libraries.
@rajkan01
CMake: Move mbedtls stub headers to the mbedtls doubles dir
d57ed8d 
Previously all the mbedtls stubs headers under mbed-stubs-headers,
so this PR move all mbedtls stubs headers under
mbedtls/tests/UNITTESTS/double directory and update CMake to include
stubs headers into mbed-stubs-mbedtls library to make mbedtls stubs
to be self-contained.
@rajkan01
CMake: Limit the mbed-stubs-mbedtls to required dependency mocks
f500226
@rajkan01 rajkan01 force-pushed the move_connectivity_mbedtls_stubs branch from 412a7ad to f500226 Compare July 12, 2021 14:19
@rajkan01 rajkan01 requested a review from LDong-Arm July 12, 2021 14:19
@mergify mergify bot added needs: CI and removed needs: review labels Jul 13, 2021
@mbed-ci
Copy link

mbed-ci commented Jul 13, 2021

Jenkins CI Test : ✔️ SUCCESS

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_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-GCC_ARM ✔️
jenkins-ci/mbed-os-ci_build-example-ARM ✔️
jenkins-ci/mbed-os-ci_greentea-test ✔️

@0xc0170 0xc0170 merged commit 46b411d into master Jul 13, 2021
@0xc0170 0xc0170 deleted the move_connectivity_mbedtls_stubs branch July 13, 2021 12:21
@mergify mergify bot removed the ready for merge label Jul 13, 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
Reviewers

@LDong-Arm LDong-Arm LDong-Arm approved these changes

@0xc0170 0xc0170 0xc0170 approved these changes

@paul-szczepanek-arm paul-szczepanek-arm Awaiting requested review from paul-szczepanek-arm

@pan- pan- Awaiting requested review from pan-

Assignees
No one assigned
Labels
component: connectivity component: security component: test release-version: 6.13.0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Move remaining stubs files from UNITTESTS/stubs/connectivity to the Connectivity/**
6 participants
@rajkan01 @ciarmcom @mbed-ci @0xc0170 @LDong-Arm @mbedmain