Skip to content

Conversation

mpg
Copy link
Contributor

@mpg mpg commented Nov 5, 2024

Description

This is the 3.6 partial backport of 9720 - here we don't want support for tf-psa-crypto components, so I'm just backporting changes to all-core.sh in order to preserver alignment between branches (before this is moved to the framework in the next PR).

PR checklist

  • changelog not required because: internal changes, tests only
  • development PR provided All.sh add support for tf-psa-crypto components #9720
  • framework PR not required
  • 3.6 PR provided here
  • 2.28 PR not required because: 2.28 is too old for that
  • tests not required because: manual testing, see below

mpg added 2 commits November 5, 2024 10:37
In preparation for adding tf-psa-crypto/test/scripts/all.sh which will
run from tf-psa-crypto.

Use paths relative to the currently sourced file when including common
files (ie, those that will soon be moved to the framework). Otherwise,
use paths relative to the current directory, aka project's root.

Document that test/script/all.sh must be invoked from the project's root
(that was already the case, but implicit so far).

Signed-off-by: Manuel Pégourié-Gonnard <[email protected]>
The existing check only took care of CONFIG_H. This was both not enough
and too much:
- not enough because config.py can also modify CRYPTO_CONFIG_H and we
want to know about it just as much as CONFIG_H;
- too much because CONFIG_H does not exist in tf-psa-crypto.

Check a list of files instead of a single one, and adjust that list.

Also update an outdated comment about Makefiles

Signed-off-by: Manuel Pégourié-Gonnard <[email protected]>
@mpg mpg added enhancement needs-review Every commit must be reviewed by at least two team members, size-s Estimated task size: small (~2d) component-test Test framework and CI scripts priority-high High priority - will be reviewed soon labels Nov 5, 2024
@mpg mpg requested review from Harry-Ramsey and bensze01 November 5, 2024 09:45
Copy link
Contributor

@eleuzi01 eleuzi01 left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link
Contributor

@Harry-Ramsey Harry-Ramsey left a comment

Choose a reason for hiding this comment

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

LGTM.

@Harry-Ramsey Harry-Ramsey added approved Design and code approved - may be waiting for CI or backports and removed needs-review Every commit must be reviewed by at least two team members, labels Nov 6, 2024
@mpg mpg added this pull request to the merge queue Nov 6, 2024
@mpg mpg removed this pull request from the merge queue due to a manual request Nov 6, 2024
@mpg mpg added this pull request to the merge queue Nov 7, 2024
Merged via the queue into Mbed-TLS:mbedtls-3.6 with commit 429fcda Nov 7, 2024
6 checks passed
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 enhancement priority-high High priority - will be reviewed soon size-s Estimated task size: small (~2d)

Development

Successfully merging this pull request may close these issues.

3 participants