diff options
| author | Tristan Maat <tristan.maat@codethink.co.uk> | 2017-12-18 13:53:06 +0000 |
|---|---|---|
| committer | Tristan Maat <tristan.maat@codethink.co.uk> | 2018-02-07 13:03:28 +0000 |
| commit | b351de2a403893e02192bfefa0705442dc6a7980 (patch) | |
| tree | f8af41bfc8a8591b702afc56f796e8d57b5cdd0a | |
| parent | ac33c1bef0dc4362d361156d103e1e94d4f532c4 (diff) | |
| download | buildstream-b351de2a403893e02192bfefa0705442dc6a7980.tar.gz | |
runcli.py: Allow setting individual config settings
| -rw-r--r-- | tests/testutils/runcli.py | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/tests/testutils/runcli.py b/tests/testutils/runcli.py index 8ac3dd338..6738efc7e 100644 --- a/tests/testutils/runcli.py +++ b/tests/testutils/runcli.py @@ -386,10 +386,14 @@ def configured(directory, config=None): if not config: config = {} - config['sourcedir'] = os.path.join(directory, 'sources') - config['builddir'] = os.path.join(directory, 'build') - config['artifactdir'] = os.path.join(directory, 'artifacts') - config['logdir'] = os.path.join(directory, 'logs') + if not config.get('sourcedir', False): + config['sourcedir'] = os.path.join(directory, 'sources') + if not config.get('builddir', False): + config['builddir'] = os.path.join(directory, 'build') + if not config.get('artifactdir', False): + config['artifactdir'] = os.path.join(directory, 'artifacts') + if not config.get('logdir', False): + config['logdir'] = os.path.join(directory, 'logs') # Dump it and yield the filename for test scripts to feed it # to buildstream as an artument |