diff --git a/teuthology/misc.py b/teuthology/misc.py index 6a6651e722..7e92debe5e 100644 --- a/teuthology/misc.py +++ b/teuthology/misc.py @@ -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