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

Fix all.sh --force #6248

Merged

Conversation

gilles-peskine-arm
Copy link
Contributor

@gilles-peskine-arm gilles-peskine-arm commented Aug 30, 2022

Fix #6247

Backport: #6309

This caused `all.sh --force` to fail on a clean build tree.

Signed-off-by: Gilles Peskine <[email protected]>
Other programs/*/Makefile are only created by CMake, but programs/fuzz has
its own Makefile in the repository. Fixes Mbed-TLS#6247.

Signed-off-by: Gilles Peskine <[email protected]>
@gilles-peskine-arm gilles-peskine-arm added needs-review Every commit must be reviewed by at least two team members, needs-backports Backports are missing or are pending review and approval. needs-reviewer This PR needs someone to pick it up for review size-s Estimated task size: small (~2d) component-test Test framework and CI scripts labels Aug 30, 2022
Copy link
Contributor

@davidhorstmann-arm davidhorstmann-arm left a comment

Choose a reason for hiding this comment

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

One minor point, not a blocker. Looks good otherwise.

@@ -295,7 +298,7 @@ cleanup()
-iname CMakeCache.txt -o \
-path './cmake/*.cmake' \) -exec rm -f {} \+
# Recover files overwritten by in-tree CMake builds
Copy link
Contributor

Choose a reason for hiding this comment

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

Not a blocker but it would seem good to add a comment here explaining that fuzz has a checked-in Makefile not generated by CMake (it's not obvious precisely why we skip this directory).

@davidhorstmann-arm davidhorstmann-arm removed needs-review Every commit must be reviewed by at least two team members, needs-reviewer This PR needs someone to pick it up for review labels Sep 9, 2022
@AndrzejKurek AndrzejKurek added the approved Design and code approved - may be waiting for CI or backports label Sep 15, 2022
@mpg
Copy link
Contributor

mpg commented Sep 22, 2022

@gilles-peskine-arm Just a gentle remainder that this is waiting for a backport, but would be ready for merge otherwise.

@gilles-peskine-arm gilles-peskine-arm removed the needs-backports Backports are missing or are pending review and approval. label Sep 23, 2022
@gilles-peskine-arm gilles-peskine-arm merged commit f70f4ea into Mbed-TLS:development Sep 23, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Design and code approved - may be waiting for CI or backports component-test Test framework and CI scripts size-s Estimated task size: small (~2d)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Running all.sh --force on a clean repository removes programs/fuzz/Makefile
4 participants