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/splitting.yarn | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'yarns/splitting.yarn')

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


From e86eae318a83a429a0f27954866217ebf2efa6a5 Mon Sep 17 00:00:00 2001
From: Adam Coldrick <adam.coldrick@codethink.co.uk>
Date: Fri, 18 Jul 2014 16:10:24 +0100
Subject: yarns: Test building and deployment of a system with a chunk in
 definitions

---
 yarns/splitting.yarn | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

(limited to 'yarns/splitting.yarn')

diff --git a/yarns/splitting.yarn b/yarns/splitting.yarn
index d35153e4..1b67a881 100644
--- a/yarns/splitting.yarn
+++ b/yarns/splitting.yarn
@@ -90,7 +90,7 @@ Implementations
     IMPLEMENTS GIVEN chunk (\S+) includes the default splitting rules
     # Append default products rules
     name="$(basename "${MATCH_1%.*}")"
-    cat <<EOF >>"$DATADIR/gits/$name/$MATCH_1"
+    cat <<EOF >>"$DATADIR/gits/morphs/$MATCH_1"
     products:
     - artifact: $name-bins
       include: [ "(usr/)?s?bin/.*" ]
@@ -117,8 +117,8 @@ Implementations
     - artifact: $name-misc
       include: [ .* ]
     EOF
-    run_in "$DATADIR/gits/$name" git add "$MATCH_1"
-    run_in "$DATADIR/gits/$name" git commit -m 'Add default splitting rules'
+    run_in "$DATADIR/gits/morphs" git add "$MATCH_1"
+    run_in "$DATADIR/gits/morphs" git commit -m 'Add default splitting rules'
 
     IMPLEMENTS GIVEN stratum (\S+) includes the default splitting rules
     name=$(basename "${MATCH_1%.*}")
@@ -142,6 +142,7 @@ Implementations
     -   name: test-chunk
         repo: test:test-chunk
         ref: master
+        morph: test-chunk.morph
         build-mode: test
         build-depends: []
         artifacts:
@@ -169,14 +170,14 @@ Implementations
 
     IMPLEMENTS GIVEN stratum (\S+) has chunks that aren't used in (\S+)
     # Create an extra chunk that will never successfully build
-    cat >"$DATADIR/gits/test-chunk/unbuildable-chunk.morph" <<EOF
+    cat >"$DATADIR/gits/morphs/unbuildable-chunk.morph" <<EOF
     name: unbuildable-chunk
     kind: chunk
     install-commands:
     - "false"
     EOF
-    run_in "$DATADIR/gits/test-chunk" git add unbuildable-chunk.morph
-    run_in "$DATADIR/gits/test-chunk" git commit -m 'Add unbuildable chunk'
+    run_in "$DATADIR/gits/morphs" git add unbuildable-chunk.morph
+    run_in "$DATADIR/gits/morphs" git commit -m 'Add unbuildable chunk'
 
     # Create a stratum that has an artifact that doesn't include any
     # artifacts from unbuildable-chunk
@@ -189,11 +190,13 @@ Implementations
     - name: test-chunk
       repo: test:test-chunk
       ref: master
+      morph: test-chunk.morph
       build-mode: test
       build-depends: []
     - name: unbuildable-chunk
       repo: test:test-chunk
       ref: refs/heads/master
+      morph: unbuildable-chunk.morph
       build-mode: test
       build-depends:
       - test-chunk
-- 
cgit v1.2.1