diff options
| author | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2016-04-18 19:47:56 +0000 |
|---|---|---|
| committer | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2016-05-17 08:59:44 +0000 |
| commit | 8bec47f4e087549c1b8d5e02b3aeb1df6ef20db9 (patch) | |
| tree | 7bd8d6bbc485a30eb51ce82eab7061db2cf88ca5 /yarns | |
| parent | e5980ebf622e99925bc65f60634537c0951b48ca (diff) | |
| download | morph-8bec47f4e087549c1b8d5e02b3aeb1df6ef20db9.tar.gz | |
Make `morph cross-bootstrap` work from definitions checkout
Change-Id: I9ae5a846e20c0d32047a3d4fd5892e2f632f0cbe
Diffstat (limited to 'yarns')
| -rw-r--r-- | yarns/architecture.yarn | 4 | ||||
| -rw-r--r-- | yarns/implementations.yarn | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/yarns/architecture.yarn b/yarns/architecture.yarn index d8b1182c..080776f8 100644 --- a/yarns/architecture.yarn +++ b/yarns/architecture.yarn @@ -14,7 +14,7 @@ Morph Architecture Tests GIVEN a git server AND a system called base-system-testarch.morph for the test architecture in the git server WHEN the user clones definitions - AND the user attempts to cross-bootstrap the system base-system-testarch.morph in branch master of repo test:definitions to the arch testarch + AND the user attempts to cross-bootstrap the system base-system-testarch.morph in branch master to the arch testarch THEN morph succeeded FINALLY the git server is shut down @@ -22,7 +22,7 @@ Morph Architecture Tests GIVEN a git server AND a system called base-system-testarch.morph for the test architecture in the git server WHEN the user clones definitions - AND the user attempts to cross-bootstrap the system base-system-testarch.morph in branch master of repo test:definitions to the arch unknown-archicture + AND the user attempts to cross-bootstrap the system base-system-testarch.morph in branch master to the arch unknown-archicture THEN morph failed AND the cross-bootstrap error message includes the string "Unsupported architecture "unknown-archicture" FINALLY the git server is shut down diff --git a/yarns/implementations.yarn b/yarns/implementations.yarn index 186fe316..eab162b3 100644 --- a/yarns/implementations.yarn +++ b/yarns/implementations.yarn @@ -660,10 +660,10 @@ Implementation sections for building Implementation sections for cross-bootstrapping =============================================== - IMPLEMENTS WHEN the user (attempts to )?cross-bootstraps? the system (\S+) in branch (\S+) of repo (\S+) to the arch (\S+) + IMPLEMENTS WHEN the user (attempts to )?cross-bootstraps? the system (\S+) in branch (\S+) to the arch (\S+) cd "$DATADIR/definitions" git checkout "$MATCH_3" - set -- cross-bootstrap "$MATCH_5" "$MATCH_4" "$MATCH_3" "$MATCH_2" + set -- cross-bootstrap "$MATCH_4" "$MATCH_2" if [ "$MATCH_1" != "attempts to " ]; then run_morph "$@" else attempt_morph "$@"; fi echo $@ >&2 |