From a464a9e4f1e20ce98308470ac8adf87fec415407 Mon Sep 17 00:00:00 2001
From: Richard Maw <richard.maw@gmail.com>
Date: Fri, 18 Jul 2014 16:10:18 +0100
Subject: Remove use of "morph" field in chunk specs in yarns

We don't use this in definitions.git, and we're going to change its
semantics, so the test suite would break until we introduced the new
semantics, unless we remove its use of the old semantics first.
---
 yarns/implementations.yarn | 3 ---
 yarns/regression.yarn      | 7 ++++++-
 yarns/splitting.yarn       | 3 ---
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/yarns/implementations.yarn b/yarns/implementations.yarn
index f0b5c80a..2c325985 100644
--- a/yarns/implementations.yarn
+++ b/yarns/implementations.yarn
@@ -88,7 +88,6 @@ another to hold a chunk.
     -   name: test-chunk
         repo: test:test-chunk
         ref: master
-        morph: test-chunk
         build-mode: test
         build-depends: []
     EOF
@@ -281,7 +280,6 @@ have a morphology using the test architecture.
     -   name: stage1-chunk
         repo: test:test-chunk
         ref: master
-        morph: stage1-chunk
         build-mode: bootstrap
         build-depends: []
     EOF
@@ -295,7 +293,6 @@ have a morphology using the test architecture.
     -   name: test-chunk
         repo: test:test-chunk
         ref: master
-        morph: test-chunk
         build-mode: test
         build-depends: []
     EOF
diff --git a/yarns/regression.yarn b/yarns/regression.yarn
index 97e187f5..05e2e70c 100644
--- a/yarns/regression.yarn
+++ b/yarns/regression.yarn
@@ -90,10 +90,15 @@ Implementations
     - name: bootstrap-chunk
       repo: test:test-chunk
       ref: master
-      morph: test-chunk
       build-mode: bootstrap
       build-depends: []
     EOF
 
     run_in "$DATADIR/gits/morphs" git add .
     run_in "$DATADIR/gits/morphs" git commit -m "Add bootstrap-system"
+
+    sed -e 's/test-chunk/bootstrap-chunk/g' \
+        "$DATADIR/gits/test-chunk/test-chunk.morph" \
+        > "$DATADIR/gits/test-chunk/bootstrap-chunk.morph"
+    run_in "$DATADIR/gits/test-chunk" git add .
+    run_in "$DATADIR/gits/test-chunk" git commit -m "Add bootstrap-chunk"
diff --git a/yarns/splitting.yarn b/yarns/splitting.yarn
index dbe87a5c..d35153e4 100644
--- a/yarns/splitting.yarn
+++ b/yarns/splitting.yarn
@@ -142,7 +142,6 @@ Implementations
     -   name: test-chunk
         repo: test:test-chunk
         ref: master
-        morph: test-chunk
         build-mode: test
         build-depends: []
         artifacts:
@@ -190,13 +189,11 @@ Implementations
     - name: test-chunk
       repo: test:test-chunk
       ref: master
-      morph: test-chunk
       build-mode: test
       build-depends: []
     - name: unbuildable-chunk
       repo: test:test-chunk
       ref: refs/heads/master
-      morph: unbuildable-chunk
       build-mode: test
       build-depends:
       - test-chunk
-- 
cgit v1.2.1