Simplify path handling

Signed-off-by: Dave Rodgman <[email protected]>

Author: daverodgman

tools/bin/mtest

@@ -100,7 +100,7 @@ if gitresult.returncode != 0 or not os.path.exists(f"{ROOT}/include/mbedtls"):
 else:
     # found root, construct the other paths
     os.chdir(ROOT)
-    TEST_DIR = ROOT + "/tests"
+    TEST_DIR = "tests"
 
     uname = subprocess.run(["uname", "-m"], stdout=subprocess.PIPE, stderr=subprocess.STDOUT).stdout.decode("utf-8").strip()
     if uname in ["aarch64", "arm64"]:
@@ -110,10 +110,10 @@ else:
     else:
         NATIVE_TARGET = uname
 
-    CONFIG_FILE          = ROOT + "/include/mbedtls/mbedtls_config.h"
+    CONFIG_FILE       = "include/mbedtls/mbedtls_config.h"
     if not os.path.exists(CONFIG_FILE):
         # config file not found, assume we are on 2.x
-        CONFIG_FILE   = ROOT + "/include/mbedtls/config.h"
+        CONFIG_FILE   = "include/mbedtls/config.h"
 
 BACKUP_SUFFIX = ".mtest_backup"
 
@@ -276,7 +276,7 @@ def toolchain(target, exit_on_failure=True):
     # basic CFLAGS setup
     # target_c_flags are options generated by mtest, which may get overridden by the user (and dropped from the resulting set of flags)
 
-    target_c_flags = [f"-I{ROOT}/include"] + COMPILER_FLAGS.get(target.compiler_family, [])
+    target_c_flags = [f"-Iinclude"] + COMPILER_FLAGS.get(target.compiler_family, [])
 
     if target.compiler_family != "iar":
         # IAR defaults to C99 and doesn't have an option for it to be explicitly specified
@@ -494,9 +494,9 @@ def git_history_contains(hash):
 
 def get_crypto_config_file():
     # parse the config file and identify the crypto config file location
-    cmd = ["clang", "-dM", "-E", f"-I{ROOT}/include", f"{ROOT}/include/mbedtls/mbedtls_config.h"]
+    cmd = ["clang", "-dM", "-E", f"-Iinclude", f"include/mbedtls/mbedtls_config.h"]
     output, _ = subrun(cmd, silent=True)
-    path = f"{ROOT}/include/psa/crypto_config.h"
+    path = f"include/psa/crypto_config.h"
     for l in output.splitlines():
         if l.startswith("#define MBEDTLS_PSA_CRYPTO_CONFIG_FILE "):
             path = l.split(" ")[-1][1:-1]
@@ -516,14 +516,14 @@ def set_config_option(action, option, crypto_config_path, silent=True):
         if not silent:
             log(f"scripts/config.py -f {crypto_config_path} {action} {option} {'1' if action == 'set' else ''}")
         if action == "set":
-            output, success = subrun([f"{ROOT}/scripts/config.py"] + force + ["--file", crypto_config_path, action, option, "1"], silent=True, ignore_failure=True)
+            output, success = subrun([f"scripts/config.py"] + force + ["--file", crypto_config_path, action, option, "1"], silent=True, ignore_failure=True)
         else:
-            output, success = subrun([f"{ROOT}/scripts/config.py"] + force + ["--file", crypto_config_path, action, option], silent=True, ignore_failure=True)
+            output, success = subrun([f"scripts/config.py"] + force + ["--file", crypto_config_path, action, option], silent=True, ignore_failure=True)
     else:
         backup_config_options(CONFIG_FILE)
         if not silent:
             log(f"scripts/config.py {action} {option}")
-        output, success = subrun([f"{ROOT}/scripts/config.py"] + force + [action, option], silent=True, ignore_failure=True)
+        output, success = subrun([f"scripts/config.py"] + force + [action, option], silent=True, ignore_failure=True)
     if success != 0:
         error(output)
 
@@ -554,24 +554,24 @@ def configure_options(target):
     # identify replacement config files, if any
     if COPY_TFM_CONFIG in options:
         config_is_tfm = True
-        if os.path.exists(f"{ROOT}/configs/config-tfm.h"):
-            new_config = f"{ROOT}/configs/config-tfm.h"
+        if os.path.exists("configs/config-tfm.h"):
+            new_config = "configs/config-tfm.h"
         else:
-            new_config = f"{ROOT}/configs/tfm_mbedcrypto_config_profile_medium.h"
-            new_crypto_config = f"{ROOT}/configs/crypto_config_profile_medium.h"
+            new_config = "configs/tfm_mbedcrypto_config_profile_medium.h"
+            new_crypto_config = "configs/crypto_config_profile_medium.h"
             # for looking at old checkouts where these configs were not in the tree, fetch from
             # date they were first created instead
             for config in [new_config, new_crypto_config]:
                 if not os.path.exists(config):
                     hash = "2f1ae5a86ebd67faa50c3983b4567656c2234674"
-                    log(f"git show {hash}:configs/{config} > configs/{config}")
-                    output, _ = subrun(["git", "show", f"{hash}:configs/{config}"], silent=True)
-                    with open(f"{ROOT}/configs/{config}", 'w') as f:
+                    log(f"git show {hash}:{config} > {config}")
+                    output, _ = subrun(["git", "show", f"{hash}:{config}"], silent=True)
+                    with open(f"{config}", 'w') as f:
                         f.write(output)
 
     for config in header_options:
         # a config file - overwrite existing config file
-        path = config if os.path.exists(config) else f"{ROOT}/configs/{config}"
+        path = config if os.path.exists(config) else f"configs/{config}"
         if path.split("/")[-1].startswith("crypto_config_"):
             new_crypto_config = path
         else:
@@ -582,12 +582,12 @@ def configure_options(target):
     # backup and overwrite the config files
     if new_config is not None:
         backup_config_options(CONFIG_FILE)
-        log(f"cp {new_config[len(ROOT) + 1:]} {CONFIG_FILE[len(ROOT) + 1:]}")
+        log(f"cp {new_config} {CONFIG_FILE}")
         shutil.copy(new_config, CONFIG_FILE)
     if new_crypto_config is not None:
         crypto_config_file = get_crypto_config_file()
         backup_config_options(crypto_config_file)
-        log(f"cp {new_crypto_config[len(ROOT) + 1:]} {crypto_config_file[len(ROOT) + 1:]}")
+        log(f"cp {new_crypto_config} {crypto_config_file}")
         shutil.copy(new_crypto_config, crypto_config_file)
 
     # apply bulk config.py settings to main config file
@@ -596,7 +596,7 @@ def configure_options(target):
         # a configuration recognised by config.py, e.g. "baremetal"
         backup_config_options(CONFIG_FILE)
         log(f"scripts/config.py {config}")
-        subrun([f"{ROOT}/scripts/config.py", config], silent=True)
+        subrun([f"scripts/config.py", config], silent=True)
 
     if config_is_tfm:
         # adjust options for older versions of the config files to allow TF-M config to build
@@ -643,7 +643,7 @@ def disassemble(target):
     # run objdump -d to disassemble
     objdump = toolchain(target)["OBJDUMP"]
     objfiles = ["library/libmbedcrypto.a", "library/libmbedtls.a", "library/libmbedx509.a" ] + args.build_targets
-    objfiles = [f"{ROOT}/{f}" for f in objfiles if os.path.exists(f"{ROOT}/{f}")]
+    objfiles = [f for f in objfiles if os.path.exists(f)]
     result = []
     for fn in args.disassemble:
         if fn is None:
@@ -775,7 +775,7 @@ def run(target, tests, quiet=False):
         for t in tests:
             log(f"running {t} on {target.arch_isa}")
             if target.is_native:
-                output, _ = subrun(f"{TEST_DIR}/" + t, test_dir=True, silent=quiet)
+                output, _ = subrun(f"./{t}", test_dir=True, silent=quiet)
             else:
                 qemu_exe = toolchain_exes(target)["qemu"]
                 output, _ = subrun([qemu_exe, t], test_dir=True, silent=quiet)
@@ -792,7 +792,7 @@ def get_supported_configs():
     s = [x[:24].split()[0] for x in s if len(s) >= 24 and len(x[:24].strip()) > 0]
     s = [x for x in s if x not in ["get", "set", "set-all", "unset", "unset-all"] and "," not in x]
     # get the list of config files
-    config_files = [x for x in os.listdir(f'{ROOT}/configs') if x.endswith(".h")]
+    config_files = [x for x in os.listdir(f'configs') if x.endswith(".h")]
     return s + config_files
 
 
@@ -931,7 +931,7 @@ Build targets: build the library by default, or files (e.g. aes.o), programs (e.
     args.rest = [x for x in args.rest if not x.startswith("CFLAGS=") and not x.startswith("LDFLAGS=") and not x.startswith("CC=")]
 
     # find any things in programs to build
-    all_programs = [x[len(ROOT)+1:-2] for x in glob.glob(f'{ROOT}/programs/**/*.c', recursive=True)]
+    all_programs = [x[:-2] for x in glob.glob(f'programs/**/*.c', recursive=True)]
     args.build_targets = []
     for x in list(args.rest):
         found = [p for p in all_programs if p.endswith("/" + x)]