From 97e4e04a525f5c435aceeb4606cd58cb61d8ac4d Mon Sep 17 00:00:00 2001 From: Valerio Setti Date: Fri, 3 May 2024 15:34:06 +0200 Subject: [PATCH] generate_test_cert_macros: minor fixes - use build_tree to get the project root path - remove "if True" in an "if" statement Signed-off-by: Valerio Setti --- tests/scripts/generate_test_cert_macros.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/tests/scripts/generate_test_cert_macros.py b/tests/scripts/generate_test_cert_macros.py index 808bea4c25..1472370ffa 100755 --- a/tests/scripts/generate_test_cert_macros.py +++ b/tests/scripts/generate_test_cert_macros.py @@ -13,9 +13,11 @@ import os import sys import argparse import jinja2 +import scripts_path # pylint: disable=unused-import +from mbedtls_dev.build_tree import guess_project_root -THIS_DIR = os.path.dirname(os.path.abspath(__file__)) -DATA_FILES_PATH = os.path.join(THIS_DIR, '..', 'data_files') +TEST_DIR = os.path.join(guess_project_root(), 'tests') +DATA_FILES_PATH = os.path.join(TEST_DIR, 'data_files') INPUT_ARGS = [ ("string", "TEST_CA_CRT_EC_PEM", DATA_FILES_PATH + "/test-ca2.crt"), @@ -52,12 +54,12 @@ INPUT_ARGS = [ def main(): parser = argparse.ArgumentParser() - default_output_path = os.path.join(THIS_DIR, '..', 'test_certs.h') + default_output_path = os.path.join(TEST_DIR, 'src', 'test_certs.h') parser.add_argument('--output', type=str, default=default_output_path) parser.add_argument('--list-dependencies', action='store_true') args = parser.parse_args() - if args.list_dependencies is True: + if args.list_dependencies: files_list = [arg[2] for arg in INPUT_ARGS] print(" ".join(files_list)) return