diff options
| author | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2015-01-20 15:02:21 +0000 |
|---|---|---|
| committer | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2015-01-20 15:10:42 +0000 |
| commit | 0111a863583bd958555aa7be79f983fe26f0865c (patch) | |
| tree | 9ebf3d12de93fbfe13a671d3a705d3f5df2c52c7 | |
| parent | 7c5708a317fd9773bd0c5196b03541c68e0f2ce1 (diff) | |
| download | morph-0111a863583bd958555aa7be79f983fe26f0865c.tar.gz | |
yarns: Modify existing test to use the new cross-bootstrap command
| -rw-r--r-- | yarns/architecture.yarn | 3 | ||||
| -rw-r--r-- | yarns/implementations.yarn | 5 |
2 files changed, 7 insertions, 1 deletions
diff --git a/yarns/architecture.yarn b/yarns/architecture.yarn index 5b942283..a6cd51d9 100644 --- a/yarns/architecture.yarn +++ b/yarns/architecture.yarn @@ -15,12 +15,13 @@ Morph Cross-Building Tests Morph Cross-Bootstrap Tests =========================== - SCENARIO cross-bootstraping a system for a different architecture + SCENARIO cross-bootstraping and cross-bootstrap-morphology a system for a different architecture GIVEN a workspace AND a 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-bootstrap-morphology the system base-system-testarch.morph 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 to the arch testarch FINALLY the git server is shut down Architecture validation Tests diff --git a/yarns/implementations.yarn b/yarns/implementations.yarn index 7e5117fa..723eca54 100644 --- a/yarns/implementations.yarn +++ b/yarns/implementations.yarn @@ -716,6 +716,11 @@ Implementation sections for cross-bootstraping set -- cross-bootstrap-morphology "$MATCH_4" "$MATCH_3" "$MATCH_2" "$MATCH_1" run_morph "$@" + IMPLEMENTS THEN the user cross-bootstraps the system (\S+) in branch (\S+) to the arch (\S+) + cd "$DATADIR/workspace/$MATCH_2" + set -- cross-bootstrap "$MATCH_3" "$MATCH_1" + run_morph "$@" + Implementation sections for deployment ====================================== |