From 6c5455c025f6bd06353ca8803553b3c2c378501d Mon Sep 17 00:00:00 2001 From: Tim Newsome Date: Mon, 12 Jun 2023 14:24:34 -0700 Subject: [PATCH] Get gcc and gdb path from environment. If the environment variables aren't set, then use the same defaults as previously. My current set of tools use riscv64-elf-gcc and riscv64-elf-gdb, and this makes it trivial to use them. --- debug/testlib.py | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/debug/testlib.py b/debug/testlib.py index 26eac608b..ba2bd7c9d 100644 --- a/debug/testlib.py +++ b/debug/testlib.py @@ -39,10 +39,7 @@ def __init__(self, stdout, stderr): gcc_cmd = None def compile(args): # pylint: disable=redefined-builtin - if gcc_cmd: - cmd = [gcc_cmd] - else: - cmd = ["riscv64-unknown-elf-gcc"] + cmd = [gcc_cmd] cmd.append("-g") for arg in args: found = find_file(arg) @@ -607,7 +604,7 @@ def __init__(self, target, ports, cmd=None, timeout=60, binaries=None): self.target = target self.ports = ports - self.cmd = cmd or "riscv64-unknown-elf-gdb" + self.cmd = cmd self.timeout = timeout self.binaries = binaries or [None] * len(ports) @@ -1059,9 +1056,15 @@ def add_test_run_options(parser): parser.add_argument("test", nargs='*', help="Run only tests that are named here.") parser.add_argument("--gcc", - help="The command to use to start gcc.") + help="The command to use to start gcc. Defaults to the contents of " + "RISCV_TESTS_DEBUG_GCC, or riscv64-unknown-elf-gcc.", + default=os.environ.get("RISCV_TESTS_DEBUG_GCC", + "riscv64-unknown-elf-gcc")) parser.add_argument("--gdb", - help="The command to use to start gdb.") + help="The command to use to start gdb. Defaults to the contents of " + "RISCV_TESTS_DEBUG_GDB, or riscv64-unknown-elf-gdb.", + default=os.environ.get("RISCV_TESTS_DEBUG_GDB", + "riscv64-unknown-elf-gdb")) parser.add_argument("--misaval", help="Don't run ExamineTarget, just assume the misa value which is " "specified.")