Rename guess_mbedtls_root to guess_project_root
Rename for consistency. Also, replace all calls to
this function with correct name.
Signed-off-by: Thomas Daubney <thomas.daubney@arm.com>
diff --git a/scripts/generate_driver_wrappers.py b/scripts/generate_driver_wrappers.py
index 709f380..5223d45 100755
--- a/scripts/generate_driver_wrappers.py
+++ b/scripts/generate_driver_wrappers.py
@@ -163,7 +163,7 @@
"""
Main with command line arguments.
"""
- def_arg_project_root = build_tree.guess_mbedtls_root()
+ def_arg_project_root = build_tree.guess_project_root()
parser = argparse.ArgumentParser()
parser.add_argument('--project-root', default=def_arg_project_root,
diff --git a/scripts/generate_ssl_debug_helpers.py b/scripts/generate_ssl_debug_helpers.py
index a0544f1..af8ef86 100755
--- a/scripts/generate_ssl_debug_helpers.py
+++ b/scripts/generate_ssl_debug_helpers.py
@@ -367,7 +367,7 @@
Generate functions of debug helps
"""
mbedtls_root = os.path.abspath(
- mbedtls_root or build_tree.guess_mbedtls_root())
+ mbedtls_root or build_tree.guess_project_root())
with open(os.path.join(mbedtls_root, 'include/mbedtls/ssl.h')) as f:
source_code = remove_c_comments(f.read())
diff --git a/scripts/mbedtls_dev/build_tree.py b/scripts/mbedtls_dev/build_tree.py
index 9c0b5ba..da455a7 100644
--- a/scripts/mbedtls_dev/build_tree.py
+++ b/scripts/mbedtls_dev/build_tree.py
@@ -24,7 +24,7 @@
def crypto_core_directory(root: Optional[str] = None) -> str:
if root is None:
- root = guess_mbedtls_root()
+ root = guess_project_root()
if looks_like_tf_psa_crypto_root(root):
return "core"
elif looks_like_mbedtls_root(root):
@@ -55,10 +55,10 @@
raise Exception('Mbed TLS source tree not found')
-def guess_mbedtls_root():
- """Guess mbedTLS source code directory.
+def guess_project_root():
+ """Guess project source code directory.
- Return the first possible mbedTLS root directory
+ Return the first possible project root directory.
"""
dirs = set({})
for frame in inspect.stack():
@@ -71,4 +71,4 @@
dirs.add(d)
if looks_like_root(d):
return d
- raise Exception('Mbed TLS source tree not found')
+ raise Exception('Neither Mbed TLS nor TF-PSA-Crypto source tree found')