Skip to content

Use standalone greentea-client #14803

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
merged 5 commits into from
Jul 8, 2021
Merged

Conversation

Patater
Copy link
Contributor

@Patater Patater commented Jun 18, 2021

Summary of changes

Use standalone greentea-client (from https://github.com/ARMmbed/greentea-client) for Mbed CLI 2. Make a new extern folder to hold a CMakeLists.txt for fetching external dependencies like greentea-client. Use CMake's FetchContent() to fetch greentea-client.

Impact of changes

None

Migration actions required

None

Documentation

  • Need to document the new extern folder wherever we have folder structure documentation

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

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

@Patater
Copy link
Contributor Author

Patater commented Jun 18, 2021

CI started

@mbed-ci
Copy link

mbed-ci commented Jun 18, 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_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-cloud-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-ARM ✔️
jenkins-ci/mbed-os-ci_build-example-GCC_ARM ✔️
jenkins-ci/mbed-os-ci_cmake-example-GCC_ARM
jenkins-ci/mbed-os-ci_cmake-example-ARM

@jeromecoutant
Copy link
Collaborator

Use standalone greentea-client (from https://github.com/ARMmbed/greentea-client) for Mbed CLI 1.

I suppose CLI2 as CL1 doesn't use cmake ?

@Patater Patater force-pushed the fetchcontent-greentea branch from 529fc80 to a44c05b Compare June 29, 2021 12:57
@mergify mergify bot dismissed LDong-Arm’s stale review June 29, 2021 12:58

Pull request has been modified.

@mergify
Copy link

mergify bot commented Jun 29, 2021

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

@Patater Patater force-pushed the fetchcontent-greentea branch from a44c05b to 6a6bbe0 Compare July 6, 2021 12:08
@Patater
Copy link
Contributor Author

Patater commented Jul 6, 2021

Rebased on latest master

@Patater
Copy link
Contributor Author

Patater commented Jul 6, 2021

CI started

@mbed-ci
Copy link

mbed-ci commented Jul 6, 2021

Jenkins CI Test : ❌ FAILED

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_build-cloud-example-GCC_ARM ✔️
jenkins-ci/mbed-os-ci_cmake-cloud-example-GCC_ARM
jenkins-ci/mbed-os-ci_cmake-cloud-example-ARM
jenkins-ci/mbed-os-ci_build-greentea-ARM ✔️
jenkins-ci/mbed-os-ci_build-greentea-GCC_ARM ✔️
jenkins-ci/mbed-os-ci_build-example-GCC_ARM ✔️
jenkins-ci/mbed-os-ci_build-example-ARM ✔️
jenkins-ci/mbed-os-ci_cmake-example-ARM
jenkins-ci/mbed-os-ci_cmake-example-GCC_ARM

@mergify
Copy link

mergify bot commented Jul 6, 2021

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

Any external libraries we depend on can be added from the "extern"
folder.
@Patater Patater force-pushed the fetchcontent-greentea branch from fed2848 to 00fc196 Compare July 7, 2021 09:12
@Patater
Copy link
Contributor Author

Patater commented Jul 7, 2021

Rebased on latest master

@Patater Patater force-pushed the fetchcontent-greentea branch from 00fc196 to a6dba39 Compare July 7, 2021 11:21
Patater added 4 commits July 7, 2021 14:29
Use FetchContent to obtain greentea-client at version XXX.
For CMake or Mbed CLI 2, use the standalone greentea-client.
When using an exported or installed version of greentea, it's necessary
to use the greentea namespace.
Set MBED_TEST_MODE with INTERFACE. Use INTERFACE because mbed-os is an
interface target, and we can only set INTERFACE properties on interface
targets. This helps avoid the following error when building an
application.

    CMake Error at mbed-os/CMakeLists.txt:96 (target_compile_definitions):
      target_compile_definitions may only set INTERFACE properties on INTERFACE
        targets
@Patater Patater force-pushed the fetchcontent-greentea branch from a6dba39 to ef07746 Compare July 7, 2021 13:29
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

@Patater
Copy link
Contributor Author

Patater commented Jul 7, 2021

CI started

@mbed-ci
Copy link

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

@0xc0170 0xc0170 merged commit 4dea34a into ARMmbed:master Jul 8, 2021
@mergify mergify bot removed the ready for merge label Jul 8, 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.

7 participants