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.

Sign up for GitHub

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

Jump to bottom

Move mbedtls_dev to framework submodule #9094

Open
wants to merge 7 commits into
base: development
Choose a base branch
from
Open

Move mbedtls_dev to framework submodule #9094

wants to merge 7 commits into from
+107 −5,859

Conversation

davidhorstmann-arm
Copy link
Contributor

@davidhorstmann-arm davidhorstmann-arm commented May 3, 2024 •
edited

Move the mbedtls_dev python module into the mbedtls-framework repository. This PR pairs with Mbed-TLS/mbedtls-framework#15.

PR checklist

Please tick as appropriate and edit the reasons (e.g.: "backport: not needed because this is a new feature")

@davidhorstmann-arm davidhorstmann-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-ci Needs to pass CI tests needs-reviewer This PR needs someone to pick it up for review component-test Test framework and CI scripts priority-high High priority - will be reviewed soon labels May 3, 2024
@davidhorstmann-arm davidhorstmann-arm added this to Mbed TLS framework in EPICs for Mbed TLS May 3, 2024
ronald-cron-arm
ronald-cron-arm requested changes May 6, 2024
View reviewed changes
Copy link
Contributor

@ronald-cron-arm ronald-cron-arm left a comment

Choose a reason for hiding this comment

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

This looks quite good to me. I can see that the "Move some files to framework repository" commits in mbedtls and mbedtls-framework are both based on the same commit: 61734ec. The one in mbedtls removes the mbedtls_dev files while the one in mbedtls-framework removes all files but the mbedtls_dev ones that are renamed (path change only) (checked with git show 75541028a9639a8c8cb7805fdec114dc50844931 --name-status in the framework submodule).

Otherwise, have you checked that you can play the same move game subsequently on another set of mbedtls files, tests/data_files/* for example without merge trouble in framework?

tests/scripts/scripts_path.py Show resolved Hide resolved
scripts/framework_path.py Outdated Show resolved Hide resolved
@davidhorstmann-arm davidhorstmann-arm mentioned this pull request May 7, 2024
Open
@davidhorstmann-arm
Copy link
Contributor Author

Otherwise, have you checked that you can play the same move game subsequently on another set of mbedtls files, tests/data_files/* for example without merge trouble in framework?

I have now added to the script so that it can do this. The result is in Mbed-TLS/mbedtls-framework#18, which is based on the corresponding PR in the framework submodule.

@ronald-cron-arm ronald-cron-arm removed the needs-review Every commit must be reviewed by at least two team members, label May 13, 2024
ronald-cron-arm
ronald-cron-arm previously approved these changes May 13, 2024
View reviewed changes
Copy link
Contributor

@ronald-cron-arm ronald-cron-arm left a comment

Choose a reason for hiding this comment

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

This looks good to me, thanks. There is a conflict with development now thus you will need to rebase though.

@davidhorstmann-arm
Move some files to framework repository
6343a83 
Signed-off-by: David Horstmann <david.horstmann@arm.com>
@davidhorstmann-arm
Add framework/scripts to scripts_path.py
1131318 
This allows test scripts to find the new mbedtls_framework module.

Signed-off-by: David Horstmann <david.horstmann@arm.com>
@davidhorstmann-arm davidhorstmann-arm mentioned this pull request May 13, 2024
Open
4 tasks
@davidhorstmann-arm
Update references to mbedtls_dev
cd84bb2 
Change these to point to the new mbedtls_framework module in the
framework submodule.

Signed-off-by: David Horstmann <david.horstmann@arm.com>
@davidhorstmann-arm
Add framework_path module
875c32f 
This allows scripts in the scripts/ directory to get the path to the
mbedtls_framework module in framework/scripts/

Signed-off-by: David Horstmann <david.horstmann@arm.com>
@davidhorstmann-arm
Add mbedtls_framework to mypy checks
299e741 
Since this python module resides in the framework submodule we must
add an extra explicit path to it for mypy.

Signed-off-by: David Horstmann <david.horstmann@arm.com>
@davidhorstmann-arm
Update framework submodule to tip of branch
6c0e362 
This allows us to use the mbedtls_framework python files moved there.

Signed-off-by: David Horstmann <david.horstmann@arm.com>
@davidhorstmann-arm
Rename framework_path to framework_scripts_path
ecd6d01 
This name is more descriptive of its purpose, since it actually adds
framework/scripts to the path rather than just framework/

Signed-off-by: David Horstmann <david.horstmann@arm.com>
@davidhorstmann-arm davidhorstmann-arm added needs-ci Needs to pass CI tests and removed needs-ci Needs to pass CI tests needs-backports Backports are missing or are pending review and approval. labels May 13, 2024
@davidhorstmann-arm davidhorstmann-arm added needs-review Every commit must be reviewed by at least two team members, and removed needs-ci Needs to pass CI tests needs-reviewer This PR needs someone to pick it up for review labels May 13, 2024
ronald-cron-arm
ronald-cron-arm approved these changes May 21, 2024
View reviewed changes
Copy link
Contributor

@ronald-cron-arm ronald-cron-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've checked the rebase. LGTM, thanks.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ronald-cron-arm ronald-cron-arm ronald-cron-arm approved these changes

@bensze01 bensze01 Awaiting requested review from bensze01

At least 2 approving reviews are required to merge this pull request.

Assignees
No one assigned
Labels
component-test Test framework and CI scripts needs-review Every commit must be reviewed by at least two team members, priority-high High priority - will be reviewed soon
Projects
EPICs for Mbed TLS
Mbed TLS framework
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@davidhorstmann-arm @ronald-cron-arm