Skip to content

Commit

Permalink
Revert "Merge PR #1772 into master"
Browse files Browse the repository at this point in the history
This reverts commit 082ae7e, reversing
changes made to 31a356e.
  • Loading branch information
batrick committed Jun 23, 2022
1 parent 082ae7e commit 9dd3a3f
Showing 1 changed file with 0 additions and 58 deletions.
58 changes: 0 additions & 58 deletions teuthology/misc.py
Original file line number Diff line number Diff line change
Expand Up @@ -1022,64 +1022,6 @@ def deep_merge(a, b):
return b


def get_valgrind_args(testdir, name, preamble, v, exit_on_first_error=True):
"""
Build a command line for running valgrind.
testdir - test results directory
name - name of daemon (for naming hte log file)
preamble - stuff we should run before valgrind
v - valgrind arguments
"""
if v is None:
return preamble
if not isinstance(v, list):
v = [v]

# https://tracker.ceph.com/issues/44362
preamble.extend([
'env', 'OPENSSL_ia32cap=~0x1000000000000000',
])

val_path = '/var/log/ceph/valgrind'
if '--tool=memcheck' in v or '--tool=helgrind' in v:
extra_args = [
'valgrind',
'--trace-children=no',
'--child-silent-after-fork=yes',
'--soname-synonyms=somalloc=*tcmalloc*',
'--num-callers=50',
'--suppressions={tdir}/valgrind.supp'.format(tdir=testdir),
'--xml=yes',
'--xml-file={vdir}/{n}.log'.format(vdir=val_path, n=name),
'--time-stamp=yes',
'--vgdb=yes',
]
else:
extra_args = [
'valgrind',
'--trace-children=no',
'--child-silent-after-fork=yes',
'--soname-synonyms=somalloc=*tcmalloc*',
'--suppressions={tdir}/valgrind.supp'.format(tdir=testdir),
'--log-file={vdir}/{n}.log'.format(vdir=val_path, n=name),
'--time-stamp=yes',
'--vgdb=yes',
]
if exit_on_first_error:
extra_args.extend([
# at least Valgrind 3.14 is required
'--exit-on-first-error=yes',
'--error-exitcode=42',
])
args = [
'cd', testdir,
run.Raw('&&'),
] + preamble + extra_args + v
log.debug('running %s under valgrind with args %s', name, args)
return args


def ssh_keyscan(hostnames, _raise=True):
"""
Fetch the SSH public key of one or more hosts
Expand Down

0 comments on commit 9dd3a3f

Please sign in to comment.