Skip to content

Commit

Permalink
Merge pull request avocado-framework-tests#2847 from PraveenPenguin/f…
Browse files Browse the repository at this point in the history
…ix_patch

fix patch apply issue
  • Loading branch information
PraveenPenguin authored Jun 28, 2024
2 parents 7398f5d + 8c1cc5b commit 1cc3587
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion cpu/dwh.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion cpu/ebizzy.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion cpu/em_smt_folding_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion cpu/linsched.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions fuzz/fsfuzzer.py
Original file line number Diff line number Diff line change
Expand Up @@ -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!")

Expand Down
2 changes: 1 addition & 1 deletion memory/eatmemory.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 1cc3587

Please sign in to comment.