diff options
| author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2014-03-11 15:04:21 +0000 |
|---|---|---|
| committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2014-03-11 15:04:21 +0000 |
| commit | 4fbdab363b301c24933601746766afa4b9c4435e (patch) | |
| tree | 889edc86d0b9fb0c297d2e409ac9928c35d2a8b8 /config.py | |
| parent | 6e75813a8938f7e27c5a9d779f0c1c325a556650 (diff) | |
| download | system-tests-4fbdab363b301c24933601746766afa4b9c4435e.tar.gz | |
A few fixes
Diffstat (limited to 'config.py')
| -rw-r--r-- | config.py | 10 |
1 files changed, 7 insertions, 3 deletions
@@ -35,14 +35,18 @@ BOOT_TIMEOUT=20 # branch, really ... but for now, if the installed Morph can't build # baserock:baserock/morphs 'master' branch, you can change this! os.environ['PYTHONPATH'] = '/src/morph' -#MORPH_COMMAND = ['/src/morph/morph', '--no-git-update'] -MORPH_COMMAND = '/src/morph/morph' +MORPH_COMMAND = ['/src/morph/morph', '--no-git-update'] +#MORPH_COMMAND = '/src/morph/morph' #MORPH_COMMAND = 'morph' BUILD_TEMPDIR = '/src/tmp' -BRANCH = 'master' +#BRANCH = 'master' +BRANCH = 'baserock/sam/trove-configure' # For debugging. FIXME: would be better if cliapp's logging mechanism supported # logging to stdout, but .... :( VERBOSE = True + +# Set by the test runner after initialising the fixture directory. +log_dir = None |