From 19324c63d24435aac891551cee67686e5b0ffc01 Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@inktank.com>
Date: Fri, 6 Sep 2013 15:55:14 -0700
Subject: [PATCH] misc: valgrind: fix valgrind.supp path

Signed-off-by: Sage Weil <sage@inktank.com>
---
 teuthology/misc.py      |  4 ++--
 teuthology/task/ceph.py | 24 ++++++++++++++++++------
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/teuthology/misc.py b/teuthology/misc.py
index 0d217dbbea..0ff1c55efa 100644
--- a/teuthology/misc.py
+++ b/teuthology/misc.py
@@ -874,7 +874,7 @@ def get_valgrind_args(testdir, name, v):
             run.Raw('&&'),
             'valgrind',
             '--num-callers=50',
-            '--suppressions=valgrind.supp',
+            '--suppressions={tdir}/valgrind.supp'.format(tdir=testdir),
             '--xml=yes',
             '--xml-file={vdir}/{n}.log'.format(vdir=val_path, n=name)
             ]
@@ -883,7 +883,7 @@ def get_valgrind_args(testdir, name, v):
             'cd', testdir,
             run.Raw('&&'),
             'valgrind',
-            '--suppressions=valgrind.supp',
+            '--suppressions={tdir}/valgrind.supp'.format(tdir=testdir),
             '--log-file={vdir}/{n}.log'.format(vdir=val_path, n=name)
             ]
     extra_args.extend(v)
diff --git a/teuthology/task/ceph.py b/teuthology/task/ceph.py
index 498e78d347..a6757f5ece 100644
--- a/teuthology/task/ceph.py
+++ b/teuthology/task/ceph.py
@@ -149,12 +149,28 @@ def ceph_log(ctx, config):
 @contextlib.contextmanager
 def ship_utilities(ctx, config):
     assert config is None
-    FILES = ['daemon-helper', 'adjust-ulimits', 'valgrind.supp', 'kcon_most']
+    testdir = teuthology.get_testdir(ctx)
+    filenames = []
+
+    log.info('Shipping valgrind.supp...')
+    with file(os.path.join(os.path.dirname(__file__), 'valgrind.supp'), 'rb') as f:
+        fn = os.path.join(testdir, 'valgrind.supp')
+        filenames.append(fn)
+        for rem in ctx.cluster.remotes.iterkeys():
+            teuthology.sudo_write_file(
+                remote=rem,
+                path=fn,
+                data=f,
+                )
+            f.seek(0)
+
+    FILES = ['daemon-helper', 'adjust-ulimits', 'kcon_most']
     destdir = '/usr/local/bin'
     for filename in FILES:
         log.info('Shipping %r...', filename)
         src = os.path.join(os.path.dirname(__file__), filename)
         dst = os.path.join(destdir, filename)
+        filenames.append(dst)
         with file(src, 'rb') as f:
             for rem in ctx.cluster.remotes.iterkeys():
                 teuthology.sudo_write_file(
@@ -176,11 +192,7 @@ def ship_utilities(ctx, config):
     try:
         yield
     finally:
-        log.info('Removing shipped files: %s...', ' '.join(FILES))
-        filenames = (
-            os.path.join(destdir, filename)
-            for filename in FILES
-        )
+        log.info('Removing shipped files: %s...', ' '.join(filenames))
         run.wait(
             ctx.cluster.run(
                 args=[
-- 
2.39.5