diff options
author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2015-07-23 17:48:03 +0100 |
---|---|---|
committer | Baserock Gerrit <gerrit@baserock.org> | 2015-09-18 15:50:19 +0000 |
commit | 81ebe71089d802061c2c3cb03bfd548388d04cb8 (patch) | |
tree | 207ec00ee9ca045825dc52560d6ab6ee36e81e7b /tests.build/prefix.script | |
parent | a4d8098b229592db40565747b0444b518bf8a6eb (diff) | |
download | morph-81ebe71089d802061c2c3cb03bfd548388d04cb8.tar.gz |
Remove support for Baserock definitions format versions 3, 4 and 5
Change-Id: Iad95af65bd5c528d2e72f5b2ffa80a01152f50ff
Diffstat (limited to 'tests.build/prefix.script')
-rwxr-xr-x | tests.build/prefix.script | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/tests.build/prefix.script b/tests.build/prefix.script index 662be704..291b25cf 100755 --- a/tests.build/prefix.script +++ b/tests.build/prefix.script @@ -19,9 +19,10 @@ set -eu -# Create two chunks which print out PATH and PREFIX from their environment. -cd "$DATADIR/chunk-repo" +cd "$DATADIR/morphs-repo" git checkout -q master + +# Create two chunks which print out PATH and PREFIX from their environment. cat <<\EOF > xyzzy.morph name: xyzzy kind: chunk @@ -41,10 +42,8 @@ EOF git add xyzzy.morph git add plugh.morph -git commit -q -m "Add chunks" # Change stratum to include those two chunks, and use a custom install prefix -cd "$DATADIR/morphs-repo" cat <<EOF > hello-stratum.morph name: hello-stratum kind: stratum @@ -52,18 +51,20 @@ chunks: - name: xyzzy repo: test:chunk-repo ref: master + morph: xyzzy.morph build-depends: [] build-mode: test prefix: /plover - name: plugh repo: test:chunk-repo ref: master + morph: plugh.morph build-mode: test build-depends: - xyzzy EOF git add hello-stratum.morph -git commit -q -m "Update stratum" +git commit -q -m "Update build definitions" "$SRCDIR/scripts/test-morph" build-morphology \ test:morphs-repo master hello-system |