Merge pull request #790 from PraveenPenguin/new_fix

Moved testcase logic to use generic kernel path

Author: PraveenPenguin

testcases/GcovSetup.py

@@ -69,12 +69,17 @@ def runTest(self):
             src_path = self.util.get_distro_src('kernel', '/root', "-bp")
         elif self.distro_name == 'sles':
             src_path = self.util.get_distro_src('kernel-default', '/root', "-bp")
+        src_path_base = src_path
         out = self.cv_HOST.host_run_command(f"ls {src_path}")
         for line in out:
             if line.startswith("linux-"):
                 src_path = os.path.join(src_path, line)
                 break
         log.info("\n\nsource path = %s" %src_path)
+        self.cv_HOST.host_run_command('mkdir -p /root/kernel')
+        self.cv_HOST.host_run_command('mv %s /root/kernel/linux' %src_path)
+        self.cv_HOST.host_run_command('rm -rf %s' %src_path_base)
+        src_path = '/root/kernel/linux'
         log.info("\nadding gcov_param....")
         self.kernel_config(src_path)
         log.info("Building the new kernel...")

testcases/Lcov.py

@@ -53,7 +53,6 @@ def setUp(self):
         self.util = OpTestUtil(OpTestConfiguration.conf)
         self.c = self.cv_SYSTEM.cv_HOST.get_ssh_connection()
         self.distro = self.util.distro_name()
-        self.k_version = "".join(self.cv_HOST.host_run_command("uname -r"))
 
     def runTest(self):
         '''
@@ -102,8 +101,7 @@ def runTest(self):
         Running the test
         '''
         self.c = self.cv_SYSTEM.cv_HOST.get_ssh_connection()
-        self.k_version = "".join(self.cv_HOST.host_run_command("uname -r"))
-        src_path = f'/root/kernel-{self.k_version}*/linux-{self.k_version}*'
+        src_path = f'/root/kernel/linux'
         self.cv_HOST.host_run_command(f"cd {src_path}")
         src_path = "".join(self.cv_HOST.host_run_command("pwd"))
         temp_dir = tempfile.mkdtemp(prefix="Lcov_result_")