Fix paths for programs/psa

This commit fixes paths for programs/psa to tf-psa-crypto/programs/psa.

Signed-off-by: Harry Ramsey <harry.ramsey@arm.com>
This commit is contained in:
Harry Ramsey 2024-10-22 10:06:59 +01:00
parent ced26059e3
commit 75e8e030b1
7 changed files with 9 additions and 9 deletions

View File

@ -1,13 +1,13 @@
#!/usr/bin/env python3 #!/usr/bin/env python3
"""Generate psa_constant_names_generated.c """Generate psa_constant_names_generated.c
which is included by programs/psa/psa_constant_names.c. which is included by tf-psa-crypto/programs/psa/psa_constant_names.c.
The code generated by this module is only meant to be used in the context The code generated by this module is only meant to be used in the context
of that program. of that program.
An argument passed to this script will modify the output directory where the An argument passed to this script will modify the output directory where the
file is written: file is written:
* by default (no arguments passed): writes to programs/psa/ * by default (no arguments passed): writes to tf-psa-crypto/programs/psa/
* OUTPUT_FILE_DIR passed: writes to OUTPUT_FILE_DIR/ * OUTPUT_FILE_DIR passed: writes to OUTPUT_FILE_DIR/
""" """
@ -327,7 +327,7 @@ def generate_psa_constants(header_file_names, output_file_name):
if __name__ == '__main__': if __name__ == '__main__':
build_tree.chdir_to_root() build_tree.chdir_to_root()
# Allow to change the directory where psa_constant_names_generated.c is written to. # Allow to change the directory where psa_constant_names_generated.c is written to.
OUTPUT_FILE_DIR = sys.argv[1] if len(sys.argv) == 2 else "programs/psa" OUTPUT_FILE_DIR = sys.argv[1] if len(sys.argv) == 2 else "tf-psa-crypto/programs/psa"
generate_psa_constants(['tf-psa-crypto/include/psa/crypto_values.h', generate_psa_constants(['tf-psa-crypto/include/psa/crypto_values.h',
'tf-psa-crypto/include/psa/crypto_extra.h'], 'tf-psa-crypto/include/psa/crypto_extra.h'],

View File

@ -47,7 +47,7 @@ void print_buf(const char *title, uint8_t *buf, size_t len)
/* Run a PSA function and bail out if it fails. /* Run a PSA function and bail out if it fails.
* The symbolic name of the error code can be recovered using: * The symbolic name of the error code can be recovered using:
* programs/psa/psa_constant_name status <value> */ * tf-psa-crypto/programs/psa/psa_constant_name status <value> */
#define PSA_CHECK(expr) \ #define PSA_CHECK(expr) \
do \ do \
{ \ { \

View File

@ -163,7 +163,7 @@ else
check framework/scripts/generate_psa_tests.py $(framework/scripts/generate_psa_tests.py --list) check framework/scripts/generate_psa_tests.py $(framework/scripts/generate_psa_tests.py --list)
fi fi
check scripts/generate_psa_constants.py programs/psa/psa_constant_names_generated.c check scripts/generate_psa_constants.py tf-psa-crypto/programs/psa/psa_constant_names_generated.c
check framework/scripts/generate_test_keys.py framework/tests/src/test_keys.h check framework/scripts/generate_test_keys.py framework/tests/src/test_keys.h
check scripts/generate_driver_wrappers.py ${crypto_core_dir}/psa_crypto_driver_wrappers.h \ check scripts/generate_driver_wrappers.py ${crypto_core_dir}/psa_crypto_driver_wrappers.h \
${crypto_core_dir}/psa_crypto_driver_wrappers_no_static.c ${crypto_core_dir}/psa_crypto_driver_wrappers_no_static.c

View File

@ -21,7 +21,7 @@ import subprocess
import sys import sys
DEFAULT_STATUS_LOG_FILE = 'tests/statuses.log' DEFAULT_STATUS_LOG_FILE = 'tests/statuses.log'
DEFAULT_PSA_CONSTANT_NAMES = 'programs/psa/psa_constant_names' DEFAULT_PSA_CONSTANT_NAMES = 'tf-psa-crypto/programs/psa/psa_constant_names'
class Statuses: class Statuses:
"""Information about observed return statues of API functions.""" """Information about observed return statues of API functions."""

View File

@ -173,7 +173,7 @@ def main():
action='store_false', dest='keep_c', action='store_false', dest='keep_c',
help='Don\'t keep the intermediate C file (default)') help='Don\'t keep the intermediate C file (default)')
parser.add_argument('--program', parser.add_argument('--program',
default='programs/psa/psa_constant_names', default='tf-psa-crypto/programs/psa/psa_constant_names',
help='Program to test') help='Program to test')
parser.add_argument('--show', parser.add_argument('--show',
action='store_true', action='store_true',

View File

@ -93,7 +93,7 @@ static void print_buf(const char *title, uint8_t *buf, size_t len)
/* Run a PSA function and bail out if it fails. /* Run a PSA function and bail out if it fails.
* The symbolic name of the error code can be recovered using: * The symbolic name of the error code can be recovered using:
* programs/psa/psa_constant_name status <value> */ * tf-psa-crypto/programs/psa/psa_constant_name status <value> */
#define PSA_CHECK(expr) \ #define PSA_CHECK(expr) \
do \ do \
{ \ { \

View File

@ -70,7 +70,7 @@ static void print_buf(const char *title, uint8_t *buf, size_t len)
/* Run a PSA function and bail out if it fails. /* Run a PSA function and bail out if it fails.
* The symbolic name of the error code can be recovered using: * The symbolic name of the error code can be recovered using:
* programs/psa/psa_constant_name status <value> */ * tf-psa-crypto/programs/psa/psa_constant_name status <value> */
#define PSA_CHECK(expr) \ #define PSA_CHECK(expr) \
do \ do \
{ \ { \