From c2fc0a83d3ba171ddb2cdd7c00570e465a11fec9 Mon Sep 17 00:00:00 2001
From: Adam Coldrick <adam.coldrick@codethink.co.uk>
Date: Mon, 30 Jun 2014 11:32:24 +0000
Subject: Fix the yarn tests to not always use filepaths for chunk morphologies

---
 yarns/implementations.yarn | 6 +++---
 yarns/regression.yarn      | 2 +-
 yarns/splitting.yarn       | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/yarns/implementations.yarn b/yarns/implementations.yarn
index eef878a1..d32bfd61 100644
--- a/yarns/implementations.yarn
+++ b/yarns/implementations.yarn
@@ -88,7 +88,7 @@ another to hold a chunk.
     -   name: test-chunk
         repo: test:test-chunk
         ref: master
-        morph: morph/test-chunk.morph
+        morph: test-chunk
         build-mode: test
         build-depends: []
     EOF
@@ -106,7 +106,7 @@ another to hold a chunk.
     # dummy files in all the places that different kinds of files are
     # usually installed. e.g. executables in `/bin` and `/usr/bin`
 
-    install -m644 -D /dev/stdin << 'EOF' "$DATADIR/gits/test-chunk/morph/test-chunk.morph"
+    install -m644 -D /dev/stdin << 'EOF' "$DATADIR/gits/test-chunk/test-chunk.morph"
     name: test-chunk
     kind: chunk
     build-system: manual
@@ -295,7 +295,7 @@ have a morphology using the test architecture.
     -   name: test-chunk
         repo: test:test-chunk
         ref: master
-        morph: morph/test-chunk.morph
+        morph: test-chunk
         build-mode: test
         build-depends: []
     EOF
diff --git a/yarns/regression.yarn b/yarns/regression.yarn
index e6fd2afb..97e187f5 100644
--- a/yarns/regression.yarn
+++ b/yarns/regression.yarn
@@ -90,7 +90,7 @@ Implementations
     - name: bootstrap-chunk
       repo: test:test-chunk
       ref: master
-      morph: morph/test-chunk.morph
+      morph: test-chunk
       build-mode: bootstrap
       build-depends: []
     EOF
diff --git a/yarns/splitting.yarn b/yarns/splitting.yarn
index 4691b536..dbe87a5c 100644
--- a/yarns/splitting.yarn
+++ b/yarns/splitting.yarn
@@ -14,7 +14,7 @@ scenario that uses all of them, not relying on the default rules.
 To test that all the fields are recognised, we set the new fields to
 their default values.
 
-    AND chunk morph/test-chunk.morph includes the default splitting rules
+    AND chunk test-chunk includes the default splitting rules
     AND stratum strata/test-stratum.morph includes the default splitting rules
     AND system systems/test-system.morph includes the default splitting rules
 
@@ -142,7 +142,7 @@ Implementations
     -   name: test-chunk
         repo: test:test-chunk
         ref: master
-        morph: morph/test-chunk.morph
+        morph: test-chunk
         build-mode: test
         build-depends: []
         artifacts:
@@ -190,13 +190,13 @@ Implementations
     - name: test-chunk
       repo: test:test-chunk
       ref: master
-      morph: morph/test-chunk.morph
+      morph: test-chunk
       build-mode: test
       build-depends: []
     - name: unbuildable-chunk
       repo: test:test-chunk
       ref: refs/heads/master
-      morph: unbuildable-chunk.morph
+      morph: unbuildable-chunk
       build-mode: test
       build-depends:
       - test-chunk
-- 
cgit v1.2.1