diff options
author | Jannis Pohlmann <jannis.pohlmann@codethink.co.uk> | 2012-09-06 15:56:06 +0000 |
---|---|---|
committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2012-09-07 18:14:44 +0100 |
commit | 63048d217f7fcd813bf1a2763dd4bc6eaf738505 (patch) | |
tree | 29f0bfd0e273df6dc59e663da88ca2452bb689b2 /tests.as-root/make-patch.script | |
parent | 03ec6cd0c01781729f8b684229c43ecc3f9d033d (diff) | |
download | morph-63048d217f7fcd813bf1a2763dd4bc6eaf738505.tar.gz |
Rename 'morph build' command to 'morph build-morphology'
This is needed because we are replacing the current build command
by a new one that builds from a local system branch. Since that will
be the more common scenario, we want the new implementaiton to go by
the name 'morph build'.
This commit therefore renames 'morph build' and updates all the
tests to use 'morph build-morphology' instead.
Diffstat (limited to 'tests.as-root/make-patch.script')
-rwxr-xr-x | tests.as-root/make-patch.script | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tests.as-root/make-patch.script b/tests.as-root/make-patch.script index 5204fce1..1578a768 100755 --- a/tests.as-root/make-patch.script +++ b/tests.as-root/make-patch.script @@ -44,7 +44,8 @@ EOF > /dev/null # Build first image. Remember the stratum. -"$SRCDIR/scripts/test-morph" build test:morphs-repo master hello-system.morph +"$SRCDIR/scripts/test-morph" build-morphology \ + test:morphs-repo master hello-system.morph img1=$(find "$DATADIR/cache/artifacts" -maxdepth 1 -name '*.system.*-rootfs') # Modify the chunk, in a new branch. @@ -63,7 +64,8 @@ sed -i 's/master/alfred/' "$DATADIR/morphs-repo/hello-system.morph" > /dev/null # Build second image. -"$SRCDIR/scripts/test-morph" build test:morphs-repo alfred hello-system.morph +"$SRCDIR/scripts/test-morph" build-morphology \ + test:morphs-repo alfred hello-system.morph img2=$(find "$DATADIR/cache/artifacts" -maxdepth 1 -name '*.system.*' \ ! -name $(basename "$img1")) |