diff options
| author | Richard Maw <richard.maw@codethink.co.uk> | 2014-07-11 14:25:40 +0100 |
|---|---|---|
| committer | Richard Maw <richard.maw@codethink.co.uk> | 2014-07-11 14:25:40 +0100 |
| commit | ce1fedb4e5ab82105853c4f3a8e05fb83f62c18e (patch) | |
| tree | 6a738f64b517992eed10c3d5891bbb27840202e4 /yarns/architecture.yarn | |
| parent | fe4486c1ec69c520a2c0aee7b52c35b57808120e (diff) | |
| parent | 597f2a19363b7e91b928d814627c9236779998fb (diff) | |
| download | morph-ce1fedb4e5ab82105853c4f3a8e05fb83f62c18e.tar.gz | |
Merge remote-tracking branch 'origin/baserock/richardmaw/S11284/morphologies-by-path-v4'
Reviewed-by: Sam Thursfield
Reviewed-by: Lars Wirzenius
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 |