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

CMake: Fix platform wait_ns greentea test Cmake #15066

Merged
merged 1 commit into from
Sep 14, 2021

Conversation

rajkan01
Copy link
Contributor

@rajkan01 rajkan01 commented Sep 13, 2021

Summary of changes

Mbed CLI 2 generates TARGET_ARM_FM macro as a string in mbed_config.cmake under the MBED_TARGET_DEFINITIONS list. Fix the if defined check for TARGET_ARM_FM by searching for the TARGET_ARM_FM string in the MBED_TARGET_DEFINITIONS list. This allows us to skip or include the test from CMake.

Impact of changes

With these changes, greentea test run by Ctest can able to skip/include the platform/wait_ns test

Migration actions required

None.

Documentation

None.


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 Sep 13, 2021
@ciarmcom ciarmcom requested a review from a team September 13, 2021 12:30
@ciarmcom
Copy link
Member

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

Mbed CLI 2 generates TARGET_ARM_FM macro as a string in mbed_config.cmake
under the MBED_TARGET_DEFINITIONS list. Fix the "if defined" check for
TARGET_ARM_FM by searching for the TARGET_ARM_FM string in the
MBED_TARGET_DEFINITIONS list. This allows us to skip or include the test from CMake.
@rajkan01 rajkan01 force-pushed the fix_platform_wait_ns_test_cmake branch from a8f1d5b to ad18cc8 Compare September 13, 2021 13:31
@mergify mergify bot dismissed Patater’s stale review September 13, 2021 13:32

Pull request has been modified.

@ciarmcom
Copy link
Member

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

@ciarmcom ciarmcom requested a review from a team September 13, 2021 14:00
@Patater
Copy link
Contributor

Patater commented Sep 14, 2021

CI started

@mbed-ci
Copy link

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

@Patater Patater merged commit 6fd39f4 into master Sep 14, 2021
@mergify mergify bot removed the ready for merge label Sep 14, 2021
@Patater Patater added this to In progress (8) in Mbed Core via automation Sep 14, 2021
@Patater Patater moved this from In progress (8) to Done in Mbed Core Sep 14, 2021
@Patater Patater moved this from Done to Reported in Mbed Core Sep 17, 2021
@mbedmain mbedmain removed release-type: patch Indentifies a PR as containing just a patch Release-pending labels Sep 21, 2021
@0xc0170 0xc0170 deleted the fix_platform_wait_ns_test_cmake branch October 5, 2021 08:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
No open projects
Mbed Core
  
Reported
Development

Successfully merging this pull request may close these issues.

None yet

6 participants