XD

trunner/config.py

@@ -161,16 +161,19 @@ def _parse_shell_command(self, config: dict):
                 prefix = "" if cmd[0].startswith("/") else self.ctx.target.exec_dir() + "/"
             else:
                 prefix = "sysexec "
-
+            
             parsed_cmd = shlex.split(prefix + cmd[0]) + cmd[1:] if self.ctx.target.rootfs else shlex.split(prefix + cmd[0].split("/")[-1]) + cmd[1:]
-            binary = cmd[0]
+            binary = cmd[0] if self.ctx.target.rootfs else cmd[0].split("/")[-1]
+            path = cmd[0].replace(cmd[0].split("/")[-1], "") if cmd[0].startswith("/") else self.ctx.target.exec_dir() + "/"
         else:
             binary = None
             parsed_cmd = cmd
+            path = ""
 
         self.test.shell = ShellOptions(
             binary=binary,
             cmd=parsed_cmd,
+            path =path,
         )
 
     def _parse_reboot(self, config: dict) -> None:

trunner/target/armv7m4.py

@@ -159,18 +159,10 @@ def build_test(self, test: TestOptions):
             app_loader = None
 
             if test.bootloader.apps:
-                for app in test.bootloader.apps:
-                    if app.file.startswith("/"):
-                        name = app.file.split("/")[-1]
-                        path = app.file.replace(name, "")
-                        app.file = name
-                        path = self.root_dir() + path
-                    else:
-                        path = self.bin_dir()
                 app_loader = STM32L4x6PloAppLoader(
                     dut=self.dut,
                     apps=test.bootloader.apps,
-                    gdb=GdbInteractive(port=3333, cwd=path),
+                    gdb=GdbInteractive(port=3333, cwd=self.root_dir() + test.shell.path),
                 )
 
             builder.add(PloHarness(self.dut, app_loader=app_loader))

trunner/target/armv7m7.py

@@ -68,17 +68,8 @@ def build_test(self, test: TestOptions) -> Callable[[TestResult], TestResult]:
             app_loader = None
 
             if test.bootloader.apps:
-                for app in test.bootloader.apps:
-                    if app.file.startswith("/"):
-                        name = app.file.split("/")[-1]
-                        path = app.file.replace(name, "")
-                        app.file = name
-                        path = self.root_dir() + path
-                    else:
-                        path = self.bin_dir()
-
                 app_loader = PloPhoenixdAppLoader(
-                    dut=self.dut, apps=test.bootloader.apps, phoenixd=Phoenixd(directory=path)
+                    dut=self.dut, apps=test.bootloader.apps, phoenixd=Phoenixd(directory=self.root_dir() + test.shell.path)
                 )
 
             builder.add(PloHarness(self.dut, app_loader=app_loader))

trunner/types.py

@@ -372,6 +372,7 @@ class BootloaderOptions:
 class ShellOptions:
     binary: Optional[str] = None
     cmd: Optional[List[str]] = None
+    path: Optional[str] = "/bin"
 
 
 def void_harness_fn(result: TestResult) -> TestResult: