summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Maw <richard.maw@codethink.co.uk>2013-11-25 12:00:15 +0000
committerRichard Maw <richard.maw@codethink.co.uk>2013-11-29 16:11:44 +0000
commitde230e7475a0cdd412990398679f23e40db23376 (patch)
treeccea77c83ce31a1c885da5a60d353ee8a0ee02db
parente9944a7d4115a4d314e3e0655762384a68722aef (diff)
downloadmorph-de230e7475a0cdd412990398679f23e40db23376.tar.gz
yarns: Change expected result of building uncommitted morphologies
The new build code uses `git update-index --add`, which means it can use morphologies that haven't previously been added.
-rw-r--r--yarns/building.yarn4
1 files changed, 1 insertions, 3 deletions
diff --git a/yarns/building.yarn b/yarns/building.yarn
index 6dad426e..5b6b29a0 100644
--- a/yarns/building.yarn
+++ b/yarns/building.yarn
@@ -6,6 +6,4 @@ Morph Building Tests
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 for our architecture in system branch master
- AND the user attempts to build the system base-system in branch master
- THEN morph failed
- AND the build error message includes the string "Did you forget to commit it?"
+ THEN morph build the system base-system of the branch master of the repo test:morphs