summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Maw <richard.maw@gmail.com>2014-07-18 15:10:18 (GMT)
committerRichard Maw <richard.maw@codethink.co.uk>2014-07-22 14:55:26 (GMT)
commita464a9e4f1e20ce98308470ac8adf87fec415407 (patch)
treecd993e31bffadf3ae265492ad404a47521b5c4ce
parent63aa14fc7fd988b03f2206cc9ed7503afa7039a0 (diff)
downloadmorph-a464a9e4f1e20ce98308470ac8adf87fec415407.tar.gz
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.
-rw-r--r--yarns/implementations.yarn3
-rw-r--r--yarns/regression.yarn7
-rw-r--r--yarns/splitting.yarn3
3 files changed, 6 insertions, 7 deletions
diff --git a/yarns/implementations.yarn b/yarns/implementations.yarn
index f0b5c80..2c32598 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 97e187f..05e2e70 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 dbe87a5..d35153e 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