summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Coldrick <adam.coldrick@codethink.co.uk>2015-04-01 14:48:59 +0000
committerAdam Coldrick <adam.coldrick@codethink.co.uk>2015-04-10 13:52:26 +0000
commit4aed082b26aa06618c06ad7384f8720b429f33bb (patch)
tree0a801d3a7421b030f0d5d4eb61bf6b5234dc2b2e
parent169b51894150fd740940e3470661e3f55cbf3855 (diff)
downloadmorph-4aed082b26aa06618c06ad7384f8720b429f33bb.tar.gz
fixup: Fix test suite for --ostree-repo-mode
-rw-r--r--yarns/implementations.yarn3
-rw-r--r--yarns/morph.shell-lib2
2 files changed, 3 insertions, 2 deletions
diff --git a/yarns/implementations.yarn b/yarns/implementations.yarn
index 6bdc3ed2..7a4a8484 100644
--- a/yarns/implementations.yarn
+++ b/yarns/implementations.yarn
@@ -1127,7 +1127,8 @@ Distbuild
exec "$SRCDIR/morph" --quiet \
--cachedir-min-space=0 --tempdir-min-space=0 \
--no-default-config --config "$DATADIR/morph.conf" \
- --cachedir "$DATADIR/distbuild-worker-cache" "$@"
+ --cachedir "$DATADIR/distbuild-worker-cache" \
+ --ostree-repo-mode="archive_z2" "$@"
EOF
IMPLEMENTS FINALLY the distbuild worker is terminated
diff --git a/yarns/morph.shell-lib b/yarns/morph.shell-lib
index 4f345a4a..3252b30f 100644
--- a/yarns/morph.shell-lib
+++ b/yarns/morph.shell-lib
@@ -39,7 +39,7 @@ run_morph()
"$SRCDIR"/morph --verbose \
--cachedir-min-space=0 --tempdir-min-space=0 \
--no-default-config --config "$DATADIR/morph.conf" \
- --log="$DATADIR/log-$1" \
+ --log="$DATADIR/log-$1" --ostree-repo-mode="archive_z2" \
"$@" 2> "$DATADIR/result-$1" > "$DATADIR/out-$1"
local exit_code="$?"
for o in log result out; do