diff options
author | Adam Coldrick <adam.coldrick@codethink.co.uk> | 2014-06-30 11:32:24 +0000 |
---|---|---|
committer | Adam Coldrick <adam.coldrick@codethink.co.uk> | 2014-07-03 17:20:31 +0000 |
commit | 2aab22d4452c38ce500a6c3c336b36b19923fb46 (patch) | |
tree | 4257f68220a238ed392f8eabde8bf4e13f56c1a9 | |
parent | 6da0ef49f8d467a7820c9cf7fcbc13e566f5db47 (diff) | |
download | morph-2aab22d4452c38ce500a6c3c336b36b19923fb46.tar.gz |
yarns: Don't use filepaths for chunk morphologies
The following commits will make morph attempt to load a chunk morphology
from the definitions repository if its morph field is a filepath rather
than a name. In preparation for this, this commit stops the yarn tests
from using a filepath in this field when the morphology is not in the
definitions repository.
-rw-r--r-- | yarns/implementations.yarn | 6 | ||||
-rw-r--r-- | yarns/regression.yarn | 2 | ||||
-rw-r--r-- | 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 |