From 5df43e64abc5620ac41d4f03b09efa98fdd9166d Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Sat, 9 Mar 2013 21:20:43 -0800 Subject: [PATCH] mpi: substitute $TESTDIR Signed-off-by: Sage Weil --- teuthology/task/mpi.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/teuthology/task/mpi.py b/teuthology/task/mpi.py index b6e760c4d94d6..773ab7645ad20 100644 --- a/teuthology/task/mpi.py +++ b/teuthology/task/mpi.py @@ -55,7 +55,10 @@ def task(ctx, config): """ assert isinstance(config, dict), 'task mpi got invalid config' assert 'exec' in config, 'task mpi got invalid config, missing exec' - mpiexec = config['exec'] + + testdir = teuthology.get_testdir(ctx) + + mpiexec = config['exec'].replace('$TESTDIR', testdir) hosts = [] remotes = [] master_remote = None @@ -85,12 +88,10 @@ def task(ctx, config): workdir = [] if 'workdir' in config: - workdir = ['-wdir', config['workdir'] ] + workdir = ['-wdir', config['workdir'].replace('$TESTDIR', testdir) ] log.info('mpi rank 0 is: {name}'.format(name=master_remote.name)) - testdir = teuthology.get_testdir(ctx) - # write out the mpi hosts file log.info('mpi nodes: [%s]' % (', '.join(hosts))) teuthology.write_file(remote=master_remote, -- 2.39.5