From 82cfa848b4c0a5a6883a8b07100d4a3f4b34587c Mon Sep 17 00:00:00 2001
From: Zack Cerza <zack@cerza.org>
Date: Fri, 6 Sep 2013 17:11:44 -0500
Subject: [PATCH] Get rid of chdir-coredump.

---
 teuthology/misc.py             | 6 ++++--
 teuthology/task/ceph.py        | 3 +--
 teuthology/task/chdir-coredump | 8 --------
 3 files changed, 5 insertions(+), 12 deletions(-)
 delete mode 100644 teuthology/task/chdir-coredump

diff --git a/teuthology/misc.py b/teuthology/misc.py
index 2a69b8698..0d217dbbe 100644
--- a/teuthology/misc.py
+++ b/teuthology/misc.py
@@ -870,7 +870,8 @@ def get_valgrind_args(testdir, name, v):
     val_path = '/var/log/ceph/valgrind'.format(tdir=testdir)
     if '--tool=memcheck' in v or '--tool=helgrind' in v:
         extra_args = [
-            'chdir-coredump',
+            'cd', testdir,
+            run.Raw('&&'),
             'valgrind',
             '--num-callers=50',
             '--suppressions=valgrind.supp',
@@ -879,7 +880,8 @@ def get_valgrind_args(testdir, name, v):
             ]
     else:
         extra_args = [
-            'chdir-coredump',
+            'cd', testdir,
+            run.Raw('&&'),
             'valgrind',
             '--suppressions=valgrind.supp',
             '--log-file={vdir}/{n}.log'.format(vdir=val_path, n=name)
diff --git a/teuthology/task/ceph.py b/teuthology/task/ceph.py
index 6852a5143..498e78d34 100644
--- a/teuthology/task/ceph.py
+++ b/teuthology/task/ceph.py
@@ -149,8 +149,7 @@ def ceph_log(ctx, config):
 @contextlib.contextmanager
 def ship_utilities(ctx, config):
     assert config is None
-    FILES = ['daemon-helper', 'adjust-ulimits', 'chdir-coredump',
-             'valgrind.supp', 'kcon_most']
+    FILES = ['daemon-helper', 'adjust-ulimits', 'valgrind.supp', 'kcon_most']
     destdir = '/usr/local/bin'
     for filename in FILES:
         log.info('Shipping %r...', filename)
diff --git a/teuthology/task/chdir-coredump b/teuthology/task/chdir-coredump
deleted file mode 100644
index 9c0b4581d..000000000
--- a/teuthology/task/chdir-coredump
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-set -e
-
-testdir=$(readlink -e $(dirname $0))
-# valgrind only dumps to cwd, so cwd there...
-cd ${testdir}/archive/coredump
-
-exec "$@"
-- 
2.47.3