diff options
| author | Jonathan Maw <jonathan.maw@codethink.co.uk> | 2013-03-15 13:13:56 +0000 |
|---|---|---|
| committer | Jonathan Maw <jonathan.maw@codethink.co.uk> | 2013-03-15 13:13:56 +0000 |
| commit | dc692f92dca17b830099e916311368ac85a3a8b6 (patch) | |
| tree | b333883e1a4cd6d2b6c43d3fc86eae526695a223 /tests.as-root | |
| parent | 38e1c6a14c5ceb21b475f4acc2534854759f1274 (diff) | |
| parent | 5b5f4a0ef4d7a04b97ccb906ec2c1b8fe66f891e (diff) | |
| download | morph-dc692f92dca17b830099e916311368ac85a3a8b6.tar.gz | |
Merge branch 'baserock/richardholland/add-metadata-dir-setting-to-branch-from-image'
Reviewed-by: Jonathan Maw <jonathan.maw@codethink.co.uk>
Diffstat (limited to 'tests.as-root')
| -rwxr-xr-x | tests.as-root/branch-from-image-works.script | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests.as-root/branch-from-image-works.script b/tests.as-root/branch-from-image-works.script index 1d694e9b..9afab661 100755 --- a/tests.as-root/branch-from-image-works.script +++ b/tests.as-root/branch-from-image-works.script @@ -49,7 +49,7 @@ workspace="$DATADIR/workspace" "$SRCDIR/scripts/test-morph" init "$workspace" cd "$workspace" "$SRCDIR/scripts/test-morph" branch-from-image \ - test:morphs mybranch "$extracted/baserock" + test:morphs mybranch --metadata-dir="$extracted/baserock" cd mybranch/test:morphs grep -qFe "$hello_chunk_commit" hello-stratum.morph tar=$("$SRCDIR/scripts/test-morph" --find-system-artifact build hello-tarball) |