diff options
| author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2012-09-11 18:05:56 +0100 |
|---|---|---|
| committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2012-09-12 14:13:42 +0100 |
| commit | 4e37fdf5adbf4d25561b472b4089b6782c599f93 (patch) | |
| tree | 82182fee7bd6f56a91b392c12dfb5cede7b4455b /tests/name-clash.script | |
| parent | 6b63ab3036e869c92b3c5d6471e4856df3583019 (diff) | |
| download | morph-4e37fdf5adbf4d25561b472b4089b6782c599f93.tar.gz | |
Don't require .morph in triplet arguments
This gives us consistency with morphologies, where the triplets are
repo|ref|morphology, not repo|ref|filename
Anyone who runs 'morph build baserock:morphs master system.morph' will
now see an error ending with 'was looking for system.morph.morph', which
should make it clear where they have gone wrong.
Diffstat (limited to 'tests/name-clash.script')
| -rwxr-xr-x | tests/name-clash.script | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/name-clash.script b/tests/name-clash.script index 974d15b0..9a3e942b 100755 --- a/tests/name-clash.script +++ b/tests/name-clash.script @@ -49,11 +49,11 @@ EOF # build the dodgy chunk "$SRCDIR/scripts/test-morph" build-morphology \ - test:chunk-repo farrokh goodbye.morph + test:chunk-repo farrokh goodbye # build a stratum "$SRCDIR/scripts/test-morph" build-morphology \ - test:morphs-repo master hello-stratum.morph + test:morphs-repo master hello-stratum # unpack it and check the contents INSTDIR="$DATADIR"/unpack |