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 connectivity netsocket stubs #14873

Merged
merged 4 commits into from
Jul 7, 2021
Merged

Conversation

rajkan01
Copy link
Contributor

@rajkan01 rajkan01 commented Jul 5, 2021

Summary of changes

fixes #14839

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

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 5, 2021
@ciarmcom ciarmcom requested a review from a team July 5, 2021 15:00
@ciarmcom
Copy link
Member

ciarmcom commented Jul 5, 2021

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

rwalton-arm
rwalton-arm previously approved these changes Jul 6, 2021
Copy link
Contributor

@rwalton-arm rwalton-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 Jul 6, 2021
@0xc0170
Copy link
Contributor

0xc0170 commented Jul 6, 2021

CI started

@mbed-ci
Copy link

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

@mergify
Copy link

mergify bot commented Jul 7, 2021

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

rajkan01 added 4 commits July 7, 2021 01:33
Move the connectivity netsocket stubs into the connectivity/netsocket
component directory. So we can avoid duplicating the mbed-os source
tree in a central UNITTESTS folder.
Update netsocket and cellular unit tests to link with a mbed-stubs-netsocket
library that it depends on instead of link with mbed-stubs
which is a group of stubs libraries.
- Previously, all netsocket headers made as a part of the
mbed-headers-connectivity library. To make it easier to separate all
the netsocket headers into the separate mbed-headers-netsocket library
and keep them, as part of netsocket stubs CMake. This makes the
netsocket stubs more self-contained and improves the composition of the library.
- Update cellular, netsocket unit tests to link only with a mbed-headers-netsocket
library that it depends on instead of link with mbed-headers
which is a group of headers libraries.
Previously all the netsocket stubs headers under mbed-stubs-headers,
so this PR move all netsocket stubs headers under
netsocket/tests/UNITTESTS/double directory and update CMake to include
stubs headers into mbed-stubs-netsocket library to make netsocket stubs
to be self-contained.
@rajkan01 rajkan01 force-pushed the move_connectivity_netsocket_stubs branch from d44d119 to ef0e3f9 Compare July 7, 2021 08:34
@mergify mergify bot dismissed rwalton-arm’s stale review July 7, 2021 08:34

Pull request has been modified.

@rajkan01
Copy link
Contributor Author

rajkan01 commented Jul 7, 2021

@0xc0170 I have re-based this PR, could you review and start the CI

@0xc0170
Copy link
Contributor

0xc0170 commented Jul 7, 2021

Ci restarted

@mbed-ci
Copy link

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

@rajkan01 rajkan01 requested a review from rwalton-arm July 7, 2021 09:57
Copy link
Member

@paul-szczepanek-arm paul-szczepanek-arm left a comment

Choose a reason for hiding this comment

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

I thought the headers was a catch-all lib that included all the headers - otherwise looks good to me.

@@ -28,8 +28,10 @@ target_sources(${TEST_NAME}
target_link_libraries(${TEST_NAME}
PRIVATE
mbed-headers
mbed-headers-netsocket
Copy link
Member

Choose a reason for hiding this comment

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

this is not included in mbed-headers?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

We will fix this part of #14879 issue

@0xc0170 0xc0170 merged commit feb48fc into master Jul 7, 2021
@mergify mergify bot removed the ready for merge label Jul 7, 2021
@0xc0170 0xc0170 deleted the move_connectivity_netsocket_stubs branch July 8, 2021 11:51
@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 netsocket stubs to Connectivity/netsocket directory
8 participants