summaryrefslogtreecommitdiff
path: root/config.py
diff options
context:
space:
mode:
Diffstat (limited to 'config.py')
-rw-r--r--config.py10
1 files changed, 7 insertions, 3 deletions
diff --git a/config.py b/config.py
index 4ccc8f2..3e6e0aa 100644
--- a/config.py
+++ b/config.py
@@ -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