fix patch apply issue

this patch address patch apply failure issue in couple of test as recent avocado has regression and community want that it should be fixed in test case Signed-off-by: Praveen K Pandey <[email protected]>
vaishnavibhat · Jun 27, 2024 · 8c1cc5b · 8c1cc5b
1 parent 7398f5d
commit 8c1cc5b
Show file tree

Hide file tree

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

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

diff --git a/cpu/em_smt_folding_test.py b/cpu/em_smt_folding_test.py
@@ -70,7 +70,7 @@ def setUp(self):
             'patch', default='Fix-build-issues-with-ebizzy.patch')
 
         os.chdir(self.sourcedir)
-        fix_patch = 'patch -p0 < %s' % (self.get_data(patch))
+        fix_patch = 'patch -p0 < %s' % (os.path.abspath(self.get_data(patch)))
         process.run(fix_patch, shell=True)
         process.run("./configure")
         build.make(self.sourcedir)

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

diff --git a/fuzz/fsfuzzer.py b/fuzz/fsfuzzer.py
@@ -67,8 +67,8 @@ def setUp(self):
 
         if d_name == "ubuntu":
             # Patch for ubuntu
-            fuzz_fix_patch = 'patch -p1 < %s' % self.get_data(
-                'fsfuzz_fix.patch')
+            fuzz_fix_patch = 'patch -p1 < %s' % os.path.abspath(self.get_data(
+                'fsfuzz_fix.patch'))
             if process.system(fuzz_fix_patch, shell=True, ignore_status=True):
                 self.log.warn("Unable to apply sh->bash patch!")
 

diff --git a/memory/eatmemory.py b/memory/eatmemory.py
@@ -42,7 +42,7 @@ def setUp(self):
         archive.extract(tarball, self.workdir)
         self.sourcedir = os.path.join(self.workdir, "eatmemory-master")
         # patch for getch remove
-        getch_patch = 'patch -p1 < %s' % self.get_data('eatmem_getch.patch')
+        getch_patch = 'patch -p1 < %s' % os.path.abspath(self.get_data('eatmem_getch.patch'))
         os.chdir(self.sourcedir)
         process.run(getch_patch, shell=True)
         build.make(self.sourcedir)