Skip to content

Commit 60e3290

Browse files
authored
Merge pull request #229 from RedisLabsModules/fix-valgrind-log-file-path
Use the absolute path for the valgrind log file
2 parents a80e0ec + f54c2f0 commit 60e3290

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

RLTest/debuggers.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ def generate_command(self, logfile=None):
2323
if '--errors-for-leak-kinds=definite' not in self.options:
2424
cmd += ['--errors-for-leak-kinds=definite']
2525
if self.suppressions:
26-
cmd += ['--suppressions=' + self.suppressions]
26+
cmd += ['--suppressions=' + os.path.abspath(self.suppressions)]
2727
if logfile:
28-
cmd += ['--log-file=' + logfile]
28+
cmd += ['--log-file=' + os.path.abspath(logfile)]
2929
return cmd
3030

3131

tests/unit/test_debuggers.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,13 @@ def test_generate_command_default(self):
1313
def test_generate_command_supression(self):
1414
default_valgrind = Valgrind(options="", suppressions="file")
1515
cmd_args = default_valgrind.generate_command()
16-
assert ['valgrind', '--error-exitcode=255', '--leak-check=full', '--errors-for-leak-kinds=definite',
17-
'--suppressions=file'] == cmd_args
16+
assert ['valgrind', '--error-exitcode=255', '--leak-check=full', '--errors-for-leak-kinds=definite'] == cmd_args[:4]
17+
assert '--suppressions=' in cmd_args[4]
18+
assert 'file' in cmd_args[4]
1819

1920
def test_generate_command_logfile(self):
2021
default_valgrind = Valgrind(options="")
2122
cmd_args = default_valgrind.generate_command('logfile')
22-
assert ['valgrind', '--error-exitcode=255', '--leak-check=full', '--errors-for-leak-kinds=definite',
23-
'--log-file=logfile'] == cmd_args
23+
assert ['valgrind', '--error-exitcode=255', '--leak-check=full', '--errors-for-leak-kinds=definite'] == cmd_args[:4]
24+
assert '--log-file=' in cmd_args[4]
25+
assert 'logfile' in cmd_args[4]

0 commit comments

Comments
 (0)