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

all.sh: Fix check_headers_in_cpp #2407

Merged
merged 2 commits into from Feb 25, 2019

Conversation

Projects
None yet
4 participants
@pkolbus
Copy link
Contributor

commented Feb 2, 2019

Description

When all.sh invokes check_headers_in_cpp, a backup config.h exists. This
causes a stray difference vs cpp_dummy_build.cpp. Fix by only collecting
the *.h files in include/mbedtls.

Fixes #2406.

Status

READY

Requires Backporting

[edited by mpg]

  • to mbedtls-2.16 - #2412
  • mbedtls-2.7 does not have the cpp check so does not need a backport

Migrations

If there is any API change, what's the incentive and logic for it.

NO

Additional comments

Any additional information that could be of interest

Todos

  • Tests
  • Documentation
  • Changelog updated
  • Backported

Steps to test or reproduce

./tests/scripts/all.sh build_default_make_gcc_and_cxx

all.sh: Fix check_headers_in_cpp
When all.sh invokes check_headers_in_cpp, a backup config.h exists. This
causes a stray difference vs cpp_dummy_build.cpp. Fix by only collecting
the *.h files in include/mbedtls.

Change-Id: Ifd415027e856858579a6699538f06fc49c793570
@RonEld
Copy link
Contributor

left a comment

Code LGTM, however a ChangeLog entry is needed

@RonEld RonEld requested a review from k-stachowiak Feb 3, 2019

@pkolbus pkolbus force-pushed the pkolbus:fix-cpp-check-headers branch from 23a355c to 995d5c1 Feb 3, 2019

@RonEld

RonEld approved these changes Feb 3, 2019

Copy link
Contributor

left a comment

LGTM

@mpg

mpg approved these changes Feb 4, 2019

Copy link
Contributor

left a comment

Looks good to me. Thanks for fixing this.

@mpg mpg removed the needs: review label Feb 4, 2019

@mpg

This comment has been minimized.

Copy link
Contributor

commented Feb 4, 2019

Note: I've taken the liberty of editing the PR description regarding backporting, which happens not to be needed here.

@mpg

This comment has been minimized.

Copy link
Contributor

commented Feb 4, 2019

This has two approving reviews and a passing CI, a valid CLA, fixes a legitimate bug with an appropriate ChangeLog entry and is not waiting for backports, so labeling as ready for merge.

@Patater

This comment has been minimized.

Copy link
Collaborator

commented Feb 4, 2019

This PR didn't apply cleanly on mbedtls-2.16, so I've raised a backport PR at #2412

Please review. Thanks.

@pkolbus

This comment has been minimized.

Copy link
Contributor Author

commented Feb 4, 2019

@mpg @Patater Thanks, LGTM

@mpg mpg removed the needs: backports label Feb 11, 2019

@k-stachowiak k-stachowiak removed their request for review Feb 20, 2019

@Patater Patater merged commit 995d5c1 into ARMmbed:development Feb 25, 2019

2 checks passed

continuous-integration/jenkins/pr-head This commit looks good
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

@pkolbus pkolbus deleted the pkolbus:fix-cpp-check-headers branch Feb 26, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.