diff options
| author | Paul Sherwood <paul.sherwood@codethink.co.uk> | 2014-06-08 11:53:09 +0000 |
|---|---|---|
| committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2014-06-09 13:31:30 +0000 |
| commit | 21e00e2a8acdeb5a67fb3d1eded28a4a0bcbd94a (patch) | |
| tree | f6571971e668ba8189d90bf9c433066248b6dca4 /yarns/implementations.yarn | |
| parent | 901e79ec9020bc810230625ba824321379f24b85 (diff) | |
| download | morph-21e00e2a8acdeb5a67fb3d1eded28a4a0bcbd94a.tar.gz | |
Fix tests for new `morph edit` syntax
Diffstat (limited to 'yarns/implementations.yarn')
| -rw-r--r-- | yarns/implementations.yarn | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/yarns/implementations.yarn b/yarns/implementations.yarn index e4f36399..0635af72 100644 --- a/yarns/implementations.yarn +++ b/yarns/implementations.yarn @@ -423,13 +423,9 @@ Editing morphologies with `morph edit`. "$field" name="$MATCH_4" "$MATCH_5"; } 2>&1 | grep -qFe "Object does not contain $MATCH_5" - IMPLEMENTS WHEN the user edits the stratum (\S+) in the system (\S+) in branch (\S+) - cd "$DATADIR/workspace/$MATCH_3/test/morphs" - run_morph edit "$MATCH_2" "$MATCH_1" - IMPLEMENTS WHEN the user edits the chunk (\S+) in the stratum (\S+) in the system (\S+) in branch (\S+) cd "$DATADIR/workspace/$MATCH_4/test/morphs" - run_morph edit "$MATCH_3" "$MATCH_2" "$MATCH_1" + run_morph edit "$MATCH_1" IMPLEMENTS THEN the edited chunk (\S+) has git branch (\S+) ls -l "$DATADIR/workspace/$MATCH_2" @@ -439,10 +435,6 @@ Editing morphologies with `morph edit`. echo "$MATCH_2" > "$DATADIR/git-branch.wanted" diff -u "$DATADIR/git-branch.wanted" "$DATADIR/git-branch.actual" - IMPLEMENTS WHEN the user edits the chunk (\S+) in the stratum (\S+) with no system specified in branch (\S+) - cd "$DATADIR/workspace/$MATCH_3" - attempt_morph edit "$MATCH_2" "$MATCH_1" - To produce buildable morphologies, we need them to be of the same architecture as the machine doing the testing. This uses `morph print-architecture` to get a value appropriate for morph. |