Merge pull request #2919 from AYUSHJAIN951/patchapplyissue

Fix patch apply issue
avocado-framework-tests · Jan 6, 2025 · 3b4416d · 3b4416d
2 parents 38a2471 + ce61c10
commit 3b4416d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/cpu/dwh.py b/cpu/dwh.py
@@ -64,12 +64,13 @@ def setUp(self):
 
         for file_name in ['dwh.cpp', 'Makefile']:
             self.copyutil(file_name)
-        os.chdir(self.teststmpdir)
         if dist.name in ['fedora', 'rhel']:
-            process.system('patch -p0 < %s' %
-                           os.path.abspath(self.get_data('fofd.patch')), shell=True)
+            cmd = 'patch -p0 < %s' % os.path.abspath(self.get_data('fofd.patch'))
         elif dist.name in ['Ubuntu', 'debian']:
-            process.system("sed -i 's/g++.*/& -lrt/' Makefile", shell=True)
+            cmd = "sed -i 's/g++.*/& -lrt/' Makefile"
+        os.chdir(self.teststmpdir)
+        process.run(cmd, shell=True)
+
         build.make(self.teststmpdir)
 
     def test(self):

diff --git a/cpu/ebizzy.py b/cpu/ebizzy.py
@@ -72,8 +72,8 @@ def setUp(self):
 
         patch = self.params.get(
             'patch', default='Fix-build-issues-with-ebizzy.patch')
-        os.chdir(self.sourcedir)
         patch_cmd = 'patch -p0 < %s' % os.path.abspath((self.get_data(patch)))
+        os.chdir(self.sourcedir)
         process.run(patch_cmd, shell=True)
         process.run('[ -x configure ] && ./configure', shell=True)
         build.make(self.sourcedir)

diff --git a/cpu/linsched.py b/cpu/linsched.py
@@ -52,8 +52,8 @@ def setUp(self):
         self.sourcedir = os.path.join(
             self.workdir, 'linux-scheduler-testing-master')
 
-        os.chdir(self.sourcedir)
         fix_patch = 'patch -p1 < %s' % os.path.abspath(self.get_data('fix.patch'))
+        os.chdir(self.sourcedir)
         process.run(fix_patch, shell=True, ignore_status=True)
 
         build.make(self.sourcedir)