diff options
| author | Richard Maw <richard.maw@codethink.co.uk> | 2014-06-19 13:55:30 +0000 |
|---|---|---|
| committer | Richard Maw <richard.maw@codethink.co.uk> | 2014-06-19 16:41:26 +0000 |
| commit | 6da0ef49f8d467a7820c9cf7fcbc13e566f5db47 (patch) | |
| tree | d82557b841d95a66c788a7473274daea2cab7fc6 /yarns/architecture.yarn | |
| parent | 6b4cb5a5a58d5a536369a20612ff7c656cdd0921 (diff) | |
| download | morph-6da0ef49f8d467a7820c9cf7fcbc13e566f5db47.tar.gz | |
yarns: Adapt to put morphologies in subdirsbaserock/richardmaw/S11284/morphologies-by-path
We want to move our morphologies in our definitions repository into
subdirectories, so they're more organised.
We'd prefer to only refer to morphologies by file path, rather than a
name that loosely corresponds to the file path, but we need to support
that for backwards compatibility until we can move all of our
morphologies into the definitions repository.
However, since we want to eventually remove this, and we want to ensure
that file paths work, we change the yarn tests to use file paths.
Diffstat (limited to 'yarns/architecture.yarn')
| -rw-r--r-- | yarns/architecture.yarn | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/yarns/architecture.yarn b/yarns/architecture.yarn index 679c804b..2240c428 100644 --- a/yarns/architecture.yarn +++ b/yarns/architecture.yarn @@ -4,9 +4,9 @@ Morph Cross-Building Tests SCENARIO building a system for a different architecture GIVEN a workspace AND a git server - AND a system called base-system-testarch for the test architecture in the git server + AND a system called base-system-testarch.morph for the test architecture in the git server WHEN the user checks out the system branch called master - AND the user attempts to build the system base-system-testarch in branch master + AND the user attempts to build the system base-system-testarch.morph in branch master THEN morph failed AND the build error message includes the string "Are you trying to cross-build?" @@ -17,6 +17,6 @@ Morph Cross-Bootstrap Tests SCENARIO cross-bootstraping a system for a different architecture GIVEN a workspace AND a git server - AND a system called base-system-testarch for the test architecture in the git server + AND a system called base-system-testarch.morph for the test architecture in the git server WHEN the user checks out the system branch called master - THEN the user cross-bootstraps the system base-system-testarch in branch master of repo test:morphs to the arch testarch + THEN the user cross-bootstraps the system base-system-testarch.morph in branch master of repo test:morphs to the arch testarch |