diff options
author | Richard Maw <richard.maw@codethink.co.uk> | 2012-09-13 09:14:08 +0000 |
---|---|---|
committer | Richard Maw <richard.maw@codethink.co.uk> | 2012-09-13 09:14:08 +0000 |
commit | 8ad6d233dc430932fb39334dd5a88985b57b0358 (patch) | |
tree | 42b10ccfe37002adf408266f8ea33f5f0f278229 /tests/name-clash.script | |
parent | be086057ae3258f1f069929ea9d36744f6845f98 (diff) | |
parent | dd21e646b320a4aeb948830034dea2ab94e32064 (diff) | |
download | morph-8ad6d233dc430932fb39334dd5a88985b57b0358.tar.gz |
Merge branch 'samthursfield/S4556-triplet-consistency' of git://roadtrain.codethink.co.uk/baserock/morph
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 |