summaryrefslogtreecommitdiff
path: root/yarns/building.yarn
diff options
context:
space:
mode:
authorLars Wirzenius <lars.wirzenius@codethink.co.uk>2013-11-29 18:24:19 +0000
committerLars Wirzenius <lars.wirzenius@codethink.co.uk>2013-11-29 18:24:19 +0000
commitaa9ae353c5143be9a922e819e0112f63e7034811 (patch)
tree1f3aaa20c61b48f80de4f583857d7a830651ec0b /yarns/building.yarn
parent134dcdcbd63f8445f6a7cdd59d11f3b0a1ba1a14 (diff)
parent400427729b882566d0e394805a306481f0810145 (diff)
downloadmorph-aa9ae353c5143be9a922e819e0112f63e7034811.tar.gz
Merge remote-tracking branch 'remotes/origin/baserock/richardmaw/S9475/refactor-build-cmd-v3'
Diffstat (limited to 'yarns/building.yarn')
-rw-r--r--yarns/building.yarn6
1 files changed, 2 insertions, 4 deletions
diff --git a/yarns/building.yarn b/yarns/building.yarn
index b78c69cd..5b6b29a0 100644
--- a/yarns/building.yarn
+++ b/yarns/building.yarn
@@ -5,7 +5,5 @@ Morph Building Tests
GIVEN a workspace
AND a git server
WHEN the user checks out the system branch called master
- AND the user creates an uncommitted system morphology called base-system-testarch for architecture testarch in system branch master
- AND the user attempts to build the system base-system-testarch in branch master
- THEN morph failed
- AND the build error message includes the string "Did you forget to commit it?"
+ AND the user creates an uncommitted system morphology called base-system for our architecture in system branch master
+ THEN morph build the system base-system of the branch master of the repo test:morphs