ltp: correctly fetch LTPROOT

LTPROOT was previously fetched via --env option, but after the
introduction of the new LTPFramework implementation, this feature
stopped to work. This patch brings back the correct usage of it.

Signed-off-by: Andrea Cervesato <[email protected]>

Author: acerv

libkirk/ltp.py

@@ -63,7 +63,7 @@ def __init__(
         self._logger = logging.getLogger("libkirk.ltp")
         self._cmd_matcher = re.compile(r'(?:"[^"]*"|\'[^\']*\'|\S+)')
         self._max_runtime = max_runtime
-        self._root = os.environ.get("LTPROOT", "/opt/ltp")
+        self._root = env.get("LTPROOT") or os.environ.get("LTPROOT", "/opt/ltp")
         self._tc_folder = os.path.join(self._root, "testcases", "bin")
 
         self._env = {
@@ -94,8 +94,7 @@ async def _read_path(self, channel: ComChannel) -> Dict[str, str]:
             if not ret or ret["returncode"] != 0:
                 raise FrameworkError("Can't read PATH variable")
 
-            tcases = os.path.join(self._root, "testcases", "bin")
-            env["PATH"] = ret["stdout"].strip() + f":{tcases}"
+            env["PATH"] = ret["stdout"].strip() + f":{self._tc_folder}"
 
         self._logger.debug("PATH=%s", env["PATH"])
 

libkirk/main.py

@@ -343,7 +343,7 @@ def _start_session(args: argparse.Namespace, parser: argparse.ArgumentParser) ->
     session = Session(
         tmpdir=tmpdir,
         sut=sut,
-        env=args.env,
+        env=args.env or {},
         exec_timeout=args.exec_timeout,
         suite_timeout=args.suite_timeout,
         workers=args.workers,