Added BareMetal platform support for LTP/Kselftest

microsoft · Aug 3, 2024 · d4365dd · d4365dd
1 parent 9de078a
commit d4365dd
Show file tree

Hide file tree

Showing 4 changed files with 255 additions and 190 deletions.
diff --git a/lisa/operating_system.py b/lisa/operating_system.py
@@ -128,6 +128,7 @@ class OperatingSystem:
     __release_pattern = re.compile(r"^DISTRIB_ID='?([^ \n']+).*$", re.M)
     __suse_release_pattern = re.compile(r"^(SUSE).*$", re.M)
     __bmc_release_pattern = re.compile(r".*(wcscli).*$", re.M)
+    __soc_variant_pattern = re.compile(r"^VARIANT=\"?([^\" \r\n]+).*?\"?\r?$", re.M)
 
     __posix_factory: Optional[Factory[Any]] = None
 
@@ -217,6 +218,7 @@ def _get_detect_string(cls, node: Any) -> Iterable[str]:
         cmd_result = typed_node.execute(cmd="cat /etc/os-release", no_error_log=True)
         yield get_matched_str(cmd_result.stdout, cls.__os_release_pattern_name)
         yield get_matched_str(cmd_result.stdout, cls.__os_release_pattern_id)
+        yield get_matched_str(cmd_result.stdout, cls.__soc_variant_pattern)
         cmd_result_os_release = cmd_result
 
         # for RedHat, CentOS 6.x
@@ -683,10 +685,13 @@ class MacOS(Posix):
     def name_pattern(cls) -> Pattern[str]:
         return re.compile("^Darwin$")
 
-
 class Linux(Posix):
     ...
 
+class M4O(Linux):
+    @classmethod
+    def name_pattern(cls) -> Pattern[str]:
+        return re.compile("^SoC$")
 
 class CoreOs(Linux):
     @classmethod

diff --git a/microsoft/testsuites/kselftest/kselftest.py b/microsoft/testsuites/kselftest/kselftest.py
@@ -10,7 +10,7 @@
 from lisa.executable import Tool
 from lisa.messages import TestStatus, send_sub_test_result_message
 from lisa.node import Node
-from lisa.operating_system import CBLMariner, Ubuntu
+from lisa.operating_system import CBLMariner, Ubuntu, M4O
 from lisa.testsuite import TestResult
 from lisa.tools import Cp, Git, Ls, Make, RemoteCopy, Tar
 from lisa.tools.chmod import Chmod
@@ -99,14 +99,19 @@ def __init__(
         # tar file path specified in yml
         self._tar_file_path = kselftest_file_path
         if self._tar_file_path:
+            self._remote_tar_path = (
+                self.node.get_pure_path("/tmp/kselftest") / os.path.basename(self._tar_file_path)
+            )
+            self._kself_installed_dir = (
+                self.node.get_pure_path("/tmp/kselftest") / "kselftest-packages"
+            )
+        else:
             self._remote_tar_path = self.get_tool_path(
                 use_global=True
             ) / os.path.basename(self._tar_file_path)
-
-        # command to run kselftests
-        self._kself_installed_dir = (
-            self.get_tool_path(use_global=True) / "kselftest-packages"
-        )
+            self._kself_installed_dir = (
+                self.get_tool_path(use_global=True) / "kselftest-packages"
+            )
 
         self._command = self._kself_installed_dir / "run_kselftest.sh"
 
@@ -117,7 +122,7 @@ def _install(self) -> bool:
                 isinstance(self.node.os, Ubuntu)
                 and self.node.os.information.version >= "18.4.0"
             )
-            or isinstance(self.node.os, CBLMariner)
+            or isinstance(self.node.os, CBLMariner) or isinstance(self.node.os, M4O)
         ):
             raise UnsupportedDistroException(
                 self.node.os, "kselftests in LISA does not support this os"
@@ -209,7 +214,7 @@ def run_all(
 
         # get username
         username = self.node.tools[Whoami].get_username()
-        result_directory = f"/home/{username}"
+        result_directory = f"/tmp/{username}"
         if os.path.exists(result_directory) is False:
             mkdir = self.node.tools[Mkdir]
             mkdir.create_directory(result_directory)
@@ -218,7 +223,7 @@ def run_all(
         result_file = f"{result_directory}/{result_file_name}"
         self.run(
             f" 2>&1 | tee {result_file}",
-            sudo=run_test_as_root,
+            sudo=True,
             force_run=True,
             shell=True,
             timeout=timeout,